Do not mark from native code. Check color and call incremental marker instead.

src/arm/macro-assembler-arm.h

Index: src/arm/macro-assembler-arm.h
diff --git a/src/arm/macro-assembler-arm.h b/src/arm/macro-assembler-arm.h
index caab8622ccf095d891649d521ee3dfe805abf404..c474831485650d78fdda63416d4626f69d41af21 100644
--- a/src/arm/macro-assembler-arm.h
+++ b/src/arm/macro-assembler-arm.h
@@ -242,22 +242,10 @@ class MacroAssembler: public Assembler {
                    Register scratch1,
                    Label* on_black);
 
-  // Checks the color of an object.  If the object is already grey or black
-  // then we just fall through, since it is already live.  If it is white and
-  // we can determine that it doesn't need to be scanned, then we just mark it
-  // black and fall through.  For the rest we jump to the label so the
-  // incremental marker can fix its assumptions.
-  void EnsureNotWhite(Register object,
-                      Register scratch1,
-                      Register scratch2,
-                      Register scratch3,
-                      Label* object_is_white_and_not_data);
-
-  // Detects conservatively whether an object is data-only, i.e. it does need to
-  // be scanned by the garbage collector.
-  void JumpIfDataObject(Register value,
-                        Register scratch,
-                        Label* not_data_object);
+  // Checks the color of an object.  If the object is white we jump to the
+  // incremental marker.
+  void CheckIfWhite(Register object, Register scratch1, Register scratch2,

[ulan, 2015/12/23 11:02:20]

Let's call it JumpIfWhite to be more descriptive.

[Hannes Payer (out of office), 2015/12/23 12:14:05]

Done.

+                    Register scratch3, Label* object_is_white);

[ulan, 2015/12/23 11:02:20]

should be value_is_white for consistency with .cc

[Hannes Payer (out of office), 2015/12/23 12:14:05]

Done.

 
   // Notify the garbage collector that we wrote a pointer into an object.
   // |object| is the object being stored into, |value| is the object being