commit 60234563a621362c6ffe753fe5368afcd6682bcb
author Elliott Hughes <enh@google.com> Fri Jun 01 12:25:59 2012 -0700
committer Elliott Hughes <enh@google.com> Fri Jun 01 12:25:59 2012 -0700
tree dc17bb4872b6badd6860d9ce029568bcba3afc43
parent 9ad4f22cd9a94a3bd3439e1bc9d67fdc3e9bc67f

Various missing hunks.

These are hunks of changes that seem to have been lost between
ics-mr1-plus-art and dalvik-dev. Maybe bad merge resolutions?

Change-Id: I822c64651dc693df38efa8bc290edb959ce3398c

build/Android.common.mk

diff --git a/build/Android.common.mk b/build/Android.common.mk
index 201d028..aeb4c79 100644
--- a/build/Android.common.mk
+++ b/build/Android.common.mk
@@ -102,6 +102,8 @@
 ifneq ($(HOST_OS),linux)
   # Some Mac OS pthread header files are broken with -fkeep-inline-functions.
   ART_HOST_DEBUG_CFLAGS := $(filter-out -fkeep-inline-functions,$(ART_HOST_DEBUG_CFLAGS))
+  # Mac OS doesn't have libsupc++.
+  ART_HOST_DEBUG_LDLIBS := $(filter-out -lsupc++,$(ART_HOST_DEBUG_LDLIBS))
 endif
 
 ART_TARGET_DEBUG_CFLAGS := $(art_debug_cflags)

src/compiler/codegen/GenInvoke.cc

diff --git a/src/compiler/codegen/GenInvoke.cc b/src/compiler/codegen/GenInvoke.cc
index 6d3c240..2217059 100644
--- a/src/compiler/codegen/GenInvoke.cc
+++ b/src/compiler/codegen/GenInvoke.cc
@@ -667,7 +667,7 @@
   oatFreeTemp(cUnit, regPtr);
   storeValue(cUnit, rlDest, rlResult);
   if (rangeCheck) {
-    launchPad->operands[2] = NULL;  // no resumption
+    launchPad->operands[2] = 0;  // no resumption
     launchPad->operands[3] = (uintptr_t)bb;
   }
   // Record that we've already inlined & null checked
@@ -852,10 +852,10 @@
   //TUNING: check if rlCmp.sRegLow is already null checked
   LIR* launchPad = rawLIR(cUnit, 0, kPseudoIntrinsicRetry, (int)mir, type);
   oatInsertGrowableList(cUnit, &cUnit->intrinsicLaunchpads,
-              (intptr_t)launchPad);
+                        (intptr_t)launchPad);
   opCmpImmBranch(cUnit, kCondEq, regCmp, 0, launchPad);
   opReg(cUnit, kOpBlx, rTgt);
-  launchPad->operands[2] = NULL;  // No return possible
+  launchPad->operands[2] = 0;  // No return possible
   launchPad->operands[3] = (uintptr_t)bb;
   // Record that we've already inlined & null checked
   mir->optimizationFlags |= (MIR_INLINED | MIR_IGNORE_NULL_CHECK);

src/compiler/codegen/x86/X86/Factory.cc

diff --git a/src/compiler/codegen/x86/X86/Factory.cc b/src/compiler/codegen/x86/X86/Factory.cc
index 11d662e..66e7028 100644
--- a/src/compiler/codegen/x86/X86/Factory.cc
+++ b/src/compiler/codegen/x86/X86/Factory.cc
@@ -586,8 +586,10 @@
       store = newLIR5(cUnit, opcode, rBase, rIndex, scale,
                       displacement + LOWORD_OFFSET, rSrc);
     } else {
-      store = newLIR5(cUnit, opcode, rBase, rIndex, scale, displacement + LOWORD_OFFSET, rSrc);
-      newLIR5(cUnit, opcode, rBase, rIndex, scale, displacement + HIWORD_OFFSET, rSrcHi);
+      store = newLIR5(cUnit, opcode, rBase, rIndex, scale,
+                      displacement + LOWORD_OFFSET, rSrc);
+      newLIR5(cUnit, opcode, rBase, rIndex, scale,
+              displacement + HIWORD_OFFSET, rSrcHi);
     }
   }
 

src/dex2oat.cc

diff --git a/src/dex2oat.cc b/src/dex2oat.cc
index c61bec1..418bf3c 100644
--- a/src/dex2oat.cc
+++ b/src/dex2oat.cc
@@ -212,7 +212,7 @@
     UniquePtr<SirtRef<ClassLoader> > class_loader(new SirtRef<ClassLoader>(NULL));
     if (class_loader.get() == NULL) {
       LOG(ERROR) << "Failed to create SirtRef for class loader";
-      return false;
+      return NULL;
     }
 
     if (!boot_image_option.empty()) {