PPC/s390: [ubsan] Port HeapObject to the new design

Port 9302db48

Original Commit Message:

    Merging the temporary HeapObjectPtr back into HeapObject.

R=jkummerow@chromium.org, joransiu@ca.ibm.com, michael_dawson@ca.ibm.com
BUG=
LOG=N

Change-Id: I4f92282b7b4c66bb73da30e076a8378e0cf24836
Reviewed-on: https://chromium-review.googlesource.com/c/1394813Reviewed-by: Joran Siu <joransiu@ca.ibm.com>
Commit-Queue: Junliang Yan <jyan@ca.ibm.com>
Cr-Commit-Position: refs/heads/master@{#58534}

src/ppc/simulator-ppc.cc

@@ -15,6 +15,7 @@
 #include "src/codegen.h"
 #include "src/disasm.h"
 #include "src/macro-assembler.h"
+#include "src/objects-inl.h"
 #include "src/ostreams.h"
 #include "src/ppc/constants-ppc.h"
 #include "src/ppc/frame-constants-ppc.h"

src/s390/simulator-s390.cc

@@ -17,6 +17,7 @@
 #include "src/codegen.h"
 #include "src/disasm.h"
 #include "src/macro-assembler.h"
+#include "src/objects-inl.h"
 #include "src/ostreams.h"
 #include "src/register-configuration.h"
 #include "src/runtime/runtime-utils.h"
@@ -422,7 +423,7 @@ void S390Debugger::Debug() {
           Heap* current_heap = sim_->isolate_->heap();
           if (obj.IsSmi()) {
             PrintF(" (smi %d)", Smi::ToInt(obj));
-          } else if (current_heap->Contains(obj)) {
+          } else if (current_heap->Contains(HeapObject::cast(obj))) {
             PrintF(" (");
             obj->ShortPrint();
             PrintF(")");