From d2e815f15be1682bb4b44d6b9f9f4aad47341f10 Mon Sep 17 00:00:00 2001 From: mvstanton Date: Tue, 28 Jul 2015 07:02:49 -0700 Subject: [PATCH] Bugfix: Incorrect type feedback vector structure on recompile. Scoping rules are different on recompile vis-a-vis global loads. BUG=chromium:514526 LOG=y NOTREECHECKS=true Review URL: https://codereview.chromium.org/1256413005 Cr-Commit-Position: refs/heads/master@{#29896} --- src/scopes.cc | 1 + test/cctest/cctest.status | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/src/scopes.cc b/src/scopes.cc index 1473b24..52e50ea 100644 --- a/src/scopes.cc +++ b/src/scopes.cc @@ -692,6 +692,7 @@ bool Scope::HasTrivialContext() const { if (scope->is_eval_scope()) return false; if (scope->scope_inside_with_) return false; if (scope->ContextLocalCount() > 0) return false; + if (scope->ContextGlobalCount() > 0) return false; } return true; } diff --git a/test/cctest/cctest.status b/test/cctest/cctest.status index 68bdac9..dc712a3 100644 --- a/test/cctest/cctest.status +++ b/test/cctest/cctest.status @@ -71,6 +71,10 @@ # This tests API threading, no point in running several variants. 'test-api/Threading*': [PASS, NO_VARIANTS], + # Parser fixes break the function name inference in the constructor. + # BUG(4331) + 'test-func-name-inference/InConstructor': [SKIP], + # The cpu profiler tests are notoriously flaky. # BUG(2999). (test/cpu-profiler/CollectCpuProfile) # BUG(3287). (test-cpu-profiler/SampleWhenFrameIsNotSetup) -- 2.7.4