[v8-dev] Remove CompilationInfo::MayUseThis() and replace it with what we really want to know: MustReplaceUn… (issue 1312713004 by [email protected])

[email protected] via codereview.chromium.org Thu, 27 Aug 2015 11:28:20 -0700

Reviewers: Michael Starzinger,

Description:

Remove CompilationInfo::MayUseThis() and replace it with what we reallywant to

know: MustReplaceUndefinedReceiverWithGlobalProxy.


[email protected]
BUG=

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

Base URL: https://chromium.googlesource.com/v8/v8.git@master

Affected files (+39, -55 lines):
  M src/arm/lithium-codegen-arm.cc
  M src/arm64/lithium-codegen-arm64.cc
  M src/compiler.h
  M src/compiler.cc
  M src/compiler/ast-graph-builder.cc
  M src/full-codegen/arm/full-codegen-arm.cc
  M src/full-codegen/arm64/full-codegen-arm64.cc
  M src/full-codegen/ia32/full-codegen-ia32.cc
  M src/full-codegen/mips/full-codegen-mips.cc
  M src/full-codegen/mips64/full-codegen-mips64.cc
  M src/full-codegen/ppc/full-codegen-ppc.cc
  M src/full-codegen/x64/full-codegen-x64.cc
  M src/full-codegen/x87/full-codegen-x87.cc
  M src/ia32/lithium-codegen-ia32.cc
  M src/mips/lithium-codegen-mips.cc
  M src/mips64/lithium-codegen-mips64.cc
  M src/ppc/lithium-codegen-ppc.cc
  M src/x64/lithium-codegen-x64.cc
  M src/x87/lithium-codegen-x87.cc


Index: src/arm/lithium-codegen-arm.cc
diff --git a/src/arm/lithium-codegen-arm.cc b/src/arm/lithium-codegen-arm.cc

index56418e5e9373ab697672aa947bf2758cfa1bfe3d..270b9335596a923ad451bf30dbf8afc1860166d1100644

--- a/src/arm/lithium-codegen-arm.cc
+++ b/src/arm/lithium-codegen-arm.cc
@@ -118,8 +118,7 @@ bool LCodeGen::GeneratePrologue() {

// Sloppy mode functions and builtins need to replace the receiverwith the

     // global proxy when called as functions (without an explicit receiver
     // object).
-    if (is_sloppy(info_->language_mode()) && info()->MayUseThis() &&
-        !info_->is_native() && info_->scope()->has_this_declaration()) {
+    if (info()->MustReplaceUndefinedReceiverWithGlobalProxy()) {
       Label ok;

int receiver_offset = info_->scope()->num_parameters() *kPointerSize;

       __ ldr(r2, MemOperand(sp, receiver_offset));
Index: src/arm64/lithium-codegen-arm64.cc

diff --git a/src/arm64/lithium-codegen-arm64.ccb/src/arm64/lithium-codegen-arm64.ccindex7cb6cb64bdd3b80ebb31a1be1b380891d7dc7039..755c290f1e83e186d89c1aa7a3d5e5d0d367de29100644

--- a/src/arm64/lithium-codegen-arm64.cc
+++ b/src/arm64/lithium-codegen-arm64.cc
@@ -630,8 +630,7 @@ bool LCodeGen::GeneratePrologue() {

// Sloppy mode functions and builtins need to replace the receiverwith the

     // global proxy when called as functions (without an explicit receiver
     // object).
-    if (is_sloppy(info_->language_mode()) && info()->MayUseThis() &&
-        !info()->is_native() && info()->scope()->has_this_declaration()) {
+    if (info()->MustReplaceUndefinedReceiverWithGlobalProxy()) {
       Label ok;
       int receiver_offset = info_->scope()->num_parameters() * kXRegSize;
       __ Peek(x10, receiver_offset);
Index: src/compiler.cc
diff --git a/src/compiler.cc b/src/compiler.cc

indexb391bf1a7e50dd4300d894cdb50aa0e3751e7624..7e2ea2597815aaf4f6fee1ea7c78f3b7402aece7100644

--- a/src/compiler.cc
+++ b/src/compiler.cc
@@ -257,11 +257,6 @@ bool CompilationInfo::has_simple_parameters() {
 }


-bool CompilationInfo::MayUseThis() const {
-  return scope()->has_this_declaration() && scope()->receiver()->is_used();
-}
-
-

int CompilationInfo::TraceInlinedFunction(Handle<SharedFunctionInfo>shared,

                                           SourcePosition position,
                                           int parent_id) {

@@ -328,6 +323,12 @@ base::SmartArrayPointer<char>CompilationInfo::GetDebugName() const {

 }


+bool CompilationInfo::MustReplaceUndefinedReceiverWithGlobalProxy() {
+  return is_sloppy(language_mode()) && !is_native() &&
+         scope()->has_this_declaration() && scope()->receiver()->is_used();
+}
+
+
 class HOptimizedGraphBuilderWithPositions: public HOptimizedGraphBuilder {
  public:
   explicit HOptimizedGraphBuilderWithPositions(CompilationInfo* info)

@@ -1750,7 +1751,6 @@ bool CompilationPhase::ShouldProduceTraceOutput()const {base::OS::StrChr(const_cast<char*>(FLAG_trace_phase), name_[0]) !=NULL);

 }

-
 #if DEBUG
 void CompilationInfo::PrintAstForTesting() {
   PrintF("--- Source from AST ---\n%s\n",
Index: src/compiler.h
diff --git a/src/compiler.h b/src/compiler.h

index66b8274f8bf6f1b1b16acbf215369bd5a4142dbb..1b17befca070fc90852fa1065e5d8bb932dfd9a3100644

--- a/src/compiler.h
+++ b/src/compiler.h
@@ -152,7 +152,6 @@ class CompilationInfo {
   Handle<JSFunction> closure() const;
   FunctionLiteral* literal() const;
   Scope* scope() const;
-  bool MayUseThis() const;
   Handle<Context> context() const;
   Handle<SharedFunctionInfo> shared_info() const;
   bool has_shared_info() const;
@@ -320,6 +319,8 @@ class CompilationInfo {
   }
   bool ShouldEnsureSpaceForLazyDeopt() { return !IsStub(); }

+  bool MustReplaceUndefinedReceiverWithGlobalProxy();
+
   // Determines whether or not to insert a self-optimization header.
   bool ShouldSelfOptimize();

Index: src/compiler/ast-graph-builder.cc

diff --git a/src/compiler/ast-graph-builder.ccb/src/compiler/ast-graph-builder.ccindex22d9e7ab5efd9850e233f17f79bb4e007f67edf9..536c3b91ef0c6d608ef8e2d2f2bc6fe0d80ced12100644

--- a/src/compiler/ast-graph-builder.cc
+++ b/src/compiler/ast-graph-builder.cc

@@ -3096,22 +3096,21 @@ Node*AstGraphBuilder::BuildPatchReceiverToGlobalProxy(Node* receiver) {// Sloppy mode functions and builtins need to replace the receiver withthe

   // global proxy when called as functions (without an explicit receiver
   // object). Otherwise there is nothing left to do here.
-  if (is_strict(language_mode()) || info()->is_native()) return receiver;
-

- // There is no need to perform patching if the receiver will never beused.

-  if (!info()->MayUseThis()) return receiver;
-
-  IfBuilder receiver_check(this);
-  Node* undefined = jsgraph()->UndefinedConstant();
-  Node* check = NewNode(javascript()->StrictEqual(), receiver, undefined);
-  receiver_check.If(check);
-  receiver_check.Then();
-  Node* proxy = BuildLoadGlobalProxy();
-  environment()->Push(proxy);
-  receiver_check.Else();
-  environment()->Push(receiver);
-  receiver_check.End();
-  return environment()->Pop();
+  if (info()->MustReplaceUndefinedReceiverWithGlobalProxy()) {
+    IfBuilder receiver_check(this);
+    Node* undefined = jsgraph()->UndefinedConstant();

+ Node* check = NewNode(javascript()->StrictEqual(), receiver,undefined);

+    receiver_check.If(check);
+    receiver_check.Then();
+    Node* proxy = BuildLoadGlobalProxy();
+    environment()->Push(proxy);
+    receiver_check.Else();
+    environment()->Push(receiver);
+    receiver_check.End();
+    return environment()->Pop();
+  } else {
+    return receiver;
+  }
 }


Index: src/full-codegen/arm/full-codegen-arm.cc

diff --git a/src/full-codegen/arm/full-codegen-arm.ccb/src/full-codegen/arm/full-codegen-arm.ccindex598d8e9f6e2af813515a1d6a70591757c6d32318..ef65b31c541f4b93ff5273a2f941e4580811f520100644

--- a/src/full-codegen/arm/full-codegen-arm.cc
+++ b/src/full-codegen/arm/full-codegen-arm.cc
@@ -120,8 +120,7 @@ void FullCodeGenerator::Generate() {