Reviewers: danno, Igor Sheludko, Paul Lind, kisg, palfia, dusmil,

Description:
MIPS: Fix r21470 "Reland r21442 Inobject slack tracking is done on a per-closure
basis instead of per-shared info basis."

BUG=

Please review this at https://codereview.chromium.org/297093002/

SVN Base: [email protected]:paul99/v8m-rb.git@master

Affected files (+5, -3 lines):
  M src/mips/builtins-mips.cc


Index: src/mips/builtins-mips.cc
diff --git a/src/mips/builtins-mips.cc b/src/mips/builtins-mips.cc
index 58effd41ce6dbe83335d4d103ea531d9af1ce2ca..ce193b9afa5adf2119f8590d76de4a486fe48a9a 100644
--- a/src/mips/builtins-mips.cc
+++ b/src/mips/builtins-mips.cc
@@ -379,9 +379,6 @@ static void Generate_JSConstructStubHelper(MacroAssembler* masm,
       __ lbu(a3, FieldMemOperand(a2, Map::kInstanceTypeOffset));
       __ Branch(&rt_call, eq, a3, Operand(JS_FUNCTION_TYPE));

-      // Use t7 to hold undefined, which is used in several places below.
-      __ LoadRoot(t7, Heap::kUndefinedValueRootIndex);
-
       if (!is_api_function) {
         Label allocate;
         MemOperand bit_field3 = FieldMemOperand(a2, Map::kBitField3Offset);
@@ -399,6 +396,8 @@ static void Generate_JSConstructStubHelper(MacroAssembler* masm,
         __ CallRuntime(Runtime::kHiddenFinalizeInstanceSize, 1);

         __ Pop(a1, a2);
+        ASSERT(JSFunction::kNoSlackTracking == 0);
+        __ mov(t2, zero_reg);

         __ bind(&allocate);
       }
@@ -438,6 +437,9 @@ static void Generate_JSConstructStubHelper(MacroAssembler* masm,
       // t2: slack tracking counter (non-API function case)
       ASSERT_EQ(3 * kPointerSize, JSObject::kHeaderSize);

+      // Use t7 to hold undefined, which is used in several places below.
+      __ LoadRoot(t7, Heap::kUndefinedValueRootIndex);
+
       if (!is_api_function) {
         Label no_inobject_slack_tracking;



--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
--- You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/d/optout.

Reply via email to