commit 381234ec1925375f6db9d4b0c741966f1130a3bb
author Junliang Yan <jyan@ca.ibm.com> Wed May 30 20:40:26 2018
committer Commit Bot <commit-bot@chromium.org> Wed May 30 22:15:24 2018
tree 360b08b937a2de78986889466e8012e0ad19ea41
parent fe12316ec4b4a101923e395791ca55442e62f4cc

Merged: s390: Remove experiment for restricting constructor return values

Revision: f46c603

NOTRY=true
NOPRESUBMIT=true
NOTREECHECKS=true
R=joransiu@ca.ibm.com

Change-Id: I29a0c2483a2493f7f57a20f2dc639f3071950c0a
Reviewed-on: https://chromium-review.googlesource.com/1079927
Reviewed-by: Joran Siu <joransiu@ca.ibm.com>
Commit-Queue: Junliang Yan <jyan@ca.ibm.com>
Cr-Commit-Position: refs/branch-heads/6.8@{#7}
Cr-Branched-From: 44d7d7d6b1041b57644400a00cb3fee35f6c51b2-refs/heads/6.8.275@{#1}
Cr-Branched-From: 5754f66f75136dc17b4c63fec84f31dfdb89186e-refs/heads/master@{#53286}

src/builtins/s390/builtins-s390.cc

diff --git a/src/builtins/s390/builtins-s390.cc b/src/builtins/s390/builtins-s390.cc
index 211455a..dbcf633 100644
--- a/src/builtins/s390/builtins-s390.cc
+++ b/src/builtins/s390/builtins-s390.cc
@@ -249,9 +249,10 @@
   __ Ret();
 }
 
+}  // namespace
+
 // The construct stub for ES5 constructor functions and ES6 class constructors.
-void Generate_JSConstructStubGeneric(MacroAssembler* masm,
-                                     bool restrict_constructor_return) {
+void Builtins::Generate_JSConstructStubGeneric(MacroAssembler* masm) {
   // ----------- S t a t e -------------
   //  --      r2: number of arguments (untagged)
   //  --      r3: constructor function
@@ -383,7 +384,7 @@
     // If the result is an object (in the ECMA sense), we should get rid
     // of the receiver and use the result; see ECMA-262 section 13.2.2-7
     // on page 74.
-    Label use_receiver, do_throw, other_result, leave_frame;
+    Label use_receiver, do_throw, leave_frame;
 
     // If the result is undefined, we jump out to using the implicit receiver.
     __ JumpIfRoot(r2, Heap::kUndefinedValueRootIndex, &use_receiver);
@@ -392,26 +393,15 @@
     // is a valid receiver.
 
     // If the result is a smi, it is *not* an object in the ECMA sense.
-    __ JumpIfSmi(r2, &other_result);
+    __ JumpIfSmi(r2, &use_receiver);
 
     // If the type of the result (stored in its map) is less than
     // FIRST_JS_RECEIVER_TYPE, it is not an object in the ECMA sense.
     STATIC_ASSERT(LAST_JS_RECEIVER_TYPE == LAST_TYPE);
     __ CompareObjectType(r2, r6, r6, FIRST_JS_RECEIVER_TYPE);
     __ bge(&leave_frame);
+    __ b(&use_receiver);
 
-    __ bind(&other_result);
-    // The result is now neither undefined nor an object.
-    if (restrict_constructor_return) {
-      // Throw if constructor function is a class constructor
-      __ LoadP(r6, MemOperand(fp, ConstructFrameConstants::kConstructorOffset));
-      __ LoadP(r6, FieldMemOperand(r6, JSFunction::kSharedFunctionInfoOffset));
-      __ LoadlW(r6, FieldMemOperand(r6, SharedFunctionInfo::kFlagsOffset));
-      __ TestBitMask(r6, SharedFunctionInfo::IsClassConstructorBit::kMask, r0);
-      __ beq(&use_receiver);
-    } else {
-      __ b(&use_receiver);
-    }
     __ bind(&do_throw);
     __ CallRuntime(Runtime::kThrowConstructorReturnedNonObject);
 
@@ -435,16 +425,7 @@
   __ AddP(sp, sp, Operand(kPointerSize));
   __ Ret();
 }
-}  // namespace
 
-void Builtins::Generate_JSConstructStubGenericRestrictedReturn(
-    MacroAssembler* masm) {
-  Generate_JSConstructStubGeneric(masm, true);
-}
-void Builtins::Generate_JSConstructStubGenericUnrestrictedReturn(
-    MacroAssembler* masm) {
-  Generate_JSConstructStubGeneric(masm, false);
-}
 void Builtins::Generate_JSBuiltinsConstructStub(MacroAssembler* masm) {
   Generate_JSBuiltinsConstructStubHelper(masm);
 }
@@ -2402,7 +2383,7 @@
           RelocInfo::CODE_TARGET);
 
   __ bind(&call_generic_stub);
-  __ Jump(masm->isolate()->builtins()->JSConstructStubGeneric(),
+  __ Jump(BUILTIN_CODE(masm->isolate(), JSConstructStubGeneric),
           RelocInfo::CODE_TARGET);
 }