[interpreter] Remove redundant flag from bytecode cctest suite.

This removes the execute_ flag, which was always the negation of top_level_. R=rmcilroy@chromium.org BUG= Review-Url: https://codereview.chromium.org/2390163003 Cr-Commit-Position: refs/heads/master@{#39961}
crosswalk-project · Oct 4, 2016 · 99cfa5f · 99cfa5f
1 parent efcb1ff
commit 99cfa5f
Show file tree

Hide file tree

Showing 75 changed files with 11 additions and 97 deletions.
diff --git a/test/cctest/interpreter/bytecode-expectations-printer.cc b/test/cctest/interpreter/bytecode-expectations-printer.cc
@@ -328,11 +328,13 @@ void BytecodeExpectationsPrinter::PrintExpectation(
 
   v8::Local<v8::Script> script = Compile(source_code.c_str());
 
-  if (execute_) Run(script);
-
-  i::Handle<i::BytecodeArray> bytecode_array =
-      top_level_ ? GetBytecodeArrayForScript(script)
-                 : GetBytecodeArrayForGlobal(test_function_name_.c_str());
+  i::Handle<i::BytecodeArray> bytecode_array;
+  if (top_level_) {
+    bytecode_array = GetBytecodeArrayForScript(script);
+  } else {
+    Run(script);
+    bytecode_array = GetBytecodeArrayForGlobal(test_function_name_.c_str());
+  }
 
   stream << "---\n";
   PrintCodeSnippet(stream, snippet);

diff --git a/test/cctest/interpreter/bytecode-expectations-printer.h b/test/cctest/interpreter/bytecode-expectations-printer.h
@@ -28,17 +28,13 @@ class BytecodeExpectationsPrinter final {
  public:
   explicit BytecodeExpectationsPrinter(v8::Isolate* i)
       : isolate_(i),
-        execute_(true),
         wrap_(true),
         top_level_(false),
         test_function_name_(kDefaultTopFunctionName) {}
 
   void PrintExpectation(std::ostream& stream,  // NOLINT
                         const std::string& snippet) const;
 
-  void set_execute(bool execute) { execute_ = execute; }
-  bool execute() const { return execute_; }
-
   void set_wrap(bool wrap) { wrap_ = wrap; }
   bool wrap() const { return wrap_; }
 
@@ -96,7 +92,6 @@ class BytecodeExpectationsPrinter final {
   }
 
   v8::Isolate* isolate_;
-  bool execute_;
   bool wrap_;
   bool top_level_;
   std::string test_function_name_;

diff --git a/test/cctest/interpreter/bytecode_expectations/ArrayLiterals.golden b/test/cctest/interpreter/bytecode_expectations/ArrayLiterals.golden
@@ -3,7 +3,6 @@
 #
 
 ---
-execute: yes
 wrap: yes
 
 ---

diff --git a/test/cctest/interpreter/bytecode_expectations/ArrayLiteralsWide.golden b/test/cctest/interpreter/bytecode_expectations/ArrayLiteralsWide.golden
@@ -3,7 +3,6 @@
 #
 
 ---
-execute: yes
 wrap: yes
 
 ---

diff --git a/test/cctest/interpreter/bytecode_expectations/AssignmentsInBinaryExpression.golden b/test/cctest/interpreter/bytecode_expectations/AssignmentsInBinaryExpression.golden
@@ -3,7 +3,6 @@
 #
 
 ---
-execute: yes
 wrap: yes
 
 ---

diff --git a/test/cctest/interpreter/bytecode_expectations/BasicBlockToBoolean.golden b/test/cctest/interpreter/bytecode_expectations/BasicBlockToBoolean.golden
@@ -3,7 +3,6 @@
 #
 
 ---
-execute: yes
 wrap: yes
 
 ---

diff --git a/test/cctest/interpreter/bytecode_expectations/BasicLoops.golden b/test/cctest/interpreter/bytecode_expectations/BasicLoops.golden
@@ -3,7 +3,6 @@
 #
 
 ---
-execute: yes
 wrap: yes
 
 ---

diff --git a/test/cctest/interpreter/bytecode_expectations/BreakableBlocks.golden b/test/cctest/interpreter/bytecode_expectations/BreakableBlocks.golden
@@ -3,7 +3,6 @@
 #
 
 ---
-execute: yes
 wrap: yes
 
 ---

diff --git a/test/cctest/interpreter/bytecode_expectations/CallGlobal.golden b/test/cctest/interpreter/bytecode_expectations/CallGlobal.golden
@@ -3,7 +3,6 @@
 #
 
 ---
-execute: yes
 wrap: no
 test function name: f
 

diff --git a/test/cctest/interpreter/bytecode_expectations/CallLookupSlot.golden b/test/cctest/interpreter/bytecode_expectations/CallLookupSlot.golden
@@ -3,7 +3,6 @@
 #
 
 ---
-execute: yes
 wrap: yes
 
 ---

diff --git a/test/cctest/interpreter/bytecode_expectations/CallNew.golden b/test/cctest/interpreter/bytecode_expectations/CallNew.golden
@@ -3,7 +3,6 @@
 #
 
 ---
-execute: yes
 wrap: no
 test function name: f
 

diff --git a/test/cctest/interpreter/bytecode_expectations/CallRuntime.golden b/test/cctest/interpreter/bytecode_expectations/CallRuntime.golden
@@ -3,7 +3,6 @@
 #
 
 ---
-execute: yes
 wrap: no
 test function name: f
 

diff --git a/test/cctest/interpreter/bytecode_expectations/ClassAndSuperClass.golden b/test/cctest/interpreter/bytecode_expectations/ClassAndSuperClass.golden
@@ -3,7 +3,6 @@
 #
 
 ---
-execute: yes
 wrap: no
 test function name: test
 

diff --git a/test/cctest/interpreter/bytecode_expectations/ClassDeclarations.golden b/test/cctest/interpreter/bytecode_expectations/ClassDeclarations.golden
@@ -3,7 +3,6 @@
 #
 
 ---
-execute: yes
 wrap: yes
 
 ---

diff --git a/test/cctest/interpreter/bytecode_expectations/CompoundExpressions.golden b/test/cctest/interpreter/bytecode_expectations/CompoundExpressions.golden
@@ -3,7 +3,6 @@
 #
 
 ---
-execute: yes
 wrap: yes
 
 ---

diff --git a/test/cctest/interpreter/bytecode_expectations/Conditional.golden b/test/cctest/interpreter/bytecode_expectations/Conditional.golden
@@ -3,7 +3,6 @@
 #
 
 ---
-execute: yes
 wrap: yes
 
 ---

diff --git a/test/cctest/interpreter/bytecode_expectations/ConstVariable.golden b/test/cctest/interpreter/bytecode_expectations/ConstVariable.golden
@@ -3,7 +3,6 @@
 #
 
 ---
-execute: yes
 wrap: yes
 
 ---

diff --git a/test/cctest/interpreter/bytecode_expectations/ConstVariableContextSlot.golden b/test/cctest/interpreter/bytecode_expectations/ConstVariableContextSlot.golden
@@ -3,7 +3,6 @@
 #
 
 ---
-execute: yes
 wrap: yes
 
 ---

diff --git a/test/cctest/interpreter/bytecode_expectations/ContextParameters.golden b/test/cctest/interpreter/bytecode_expectations/ContextParameters.golden
@@ -3,7 +3,6 @@
 #
 
 ---
-execute: yes
 wrap: no
 test function name: f
 

diff --git a/test/cctest/interpreter/bytecode_expectations/ContextVariables.golden b/test/cctest/interpreter/bytecode_expectations/ContextVariables.golden
@@ -3,7 +3,6 @@
 #
 
 ---
-execute: yes
 wrap: yes
 
 ---

diff --git a/test/cctest/interpreter/bytecode_expectations/CountOperators.golden b/test/cctest/interpreter/bytecode_expectations/CountOperators.golden
@@ -3,7 +3,6 @@
 #
 
 ---
-execute: yes
 wrap: yes
 
 ---

diff --git a/test/cctest/interpreter/bytecode_expectations/CreateArguments.golden b/test/cctest/interpreter/bytecode_expectations/CreateArguments.golden
@@ -3,7 +3,6 @@
 #
 
 ---
-execute: yes
 wrap: no
 test function name: f
 

diff --git a/test/cctest/interpreter/bytecode_expectations/CreateRestParameter.golden b/test/cctest/interpreter/bytecode_expectations/CreateRestParameter.golden
@@ -3,7 +3,6 @@
 #
 
 ---
-execute: yes
 wrap: no
 test function name: f
 

diff --git a/test/cctest/interpreter/bytecode_expectations/DeadCodeRemoval.golden b/test/cctest/interpreter/bytecode_expectations/DeadCodeRemoval.golden
@@ -3,7 +3,6 @@
 #
 
 ---
-execute: yes
 wrap: yes
 
 ---

diff --git a/test/cctest/interpreter/bytecode_expectations/DeclareGlobals.golden b/test/cctest/interpreter/bytecode_expectations/DeclareGlobals.golden
@@ -3,7 +3,6 @@
 #
 
 ---
-execute: no
 wrap: no
 top level: yes
 

diff --git a/test/cctest/interpreter/bytecode_expectations/Delete.golden b/test/cctest/interpreter/bytecode_expectations/Delete.golden
@@ -3,7 +3,6 @@
 #
 
 ---
-execute: yes
 wrap: yes
 
 ---

diff --git a/test/cctest/interpreter/bytecode_expectations/DeleteLookupSlotInEval.golden b/test/cctest/interpreter/bytecode_expectations/DeleteLookupSlotInEval.golden
@@ -3,7 +3,6 @@
 #
 
 ---
-execute: yes
 wrap: no
 test function name: f
 

diff --git a/test/cctest/interpreter/bytecode_expectations/DoDebugger.golden b/test/cctest/interpreter/bytecode_expectations/DoDebugger.golden
@@ -3,7 +3,6 @@
 #
 
 ---
-execute: yes
 wrap: yes
 
 ---

diff --git a/test/cctest/interpreter/bytecode_expectations/DoExpression.golden b/test/cctest/interpreter/bytecode_expectations/DoExpression.golden
@@ -3,7 +3,6 @@
 #
 
 ---
-execute: yes
 wrap: yes
 do expressions: yes
 

diff --git a/test/cctest/interpreter/bytecode_expectations/Eval.golden b/test/cctest/interpreter/bytecode_expectations/Eval.golden
@@ -3,7 +3,6 @@
 #
 
 ---
-execute: yes
 wrap: yes
 
 ---

diff --git a/test/cctest/interpreter/bytecode_expectations/ForIn.golden b/test/cctest/interpreter/bytecode_expectations/ForIn.golden
@@ -3,7 +3,6 @@
 #
 
 ---
-execute: yes
 wrap: yes
 
 ---

diff --git a/test/cctest/interpreter/bytecode_expectations/ForOf.golden b/test/cctest/interpreter/bytecode_expectations/ForOf.golden
@@ -3,7 +3,6 @@
 #
 
 ---
-execute: yes
 wrap: yes
 
 ---

diff --git a/test/cctest/interpreter/bytecode_expectations/FunctionLiterals.golden b/test/cctest/interpreter/bytecode_expectations/FunctionLiterals.golden
@@ -3,7 +3,6 @@
 #
 
 ---
-execute: yes
 wrap: yes
 
 ---

diff --git a/test/cctest/interpreter/bytecode_expectations/Generators.golden b/test/cctest/interpreter/bytecode_expectations/Generators.golden
@@ -3,7 +3,6 @@
 #
 
 ---
-execute: yes
 wrap: no
 test function name: f
 

diff --git a/test/cctest/interpreter/bytecode_expectations/GlobalCompoundExpressions.golden b/test/cctest/interpreter/bytecode_expectations/GlobalCompoundExpressions.golden
@@ -3,7 +3,6 @@
 #
 
 ---
-execute: yes
 wrap: no
 test function name: f
 

diff --git a/test/cctest/interpreter/bytecode_expectations/GlobalCountOperators.golden b/test/cctest/interpreter/bytecode_expectations/GlobalCountOperators.golden
@@ -3,7 +3,6 @@
 #
 
 ---
-execute: yes
 wrap: no
 test function name: f
 

diff --git a/test/cctest/interpreter/bytecode_expectations/GlobalDelete.golden b/test/cctest/interpreter/bytecode_expectations/GlobalDelete.golden
@@ -3,7 +3,6 @@
 #
 
 ---
-execute: yes
 wrap: no
 test function name: f
 

diff --git a/test/cctest/interpreter/bytecode_expectations/HeapNumberConstants.golden b/test/cctest/interpreter/bytecode_expectations/HeapNumberConstants.golden
@@ -3,7 +3,6 @@
 #
 
 ---
-execute: yes
 wrap: yes
 
 ---

diff --git a/test/cctest/interpreter/bytecode_expectations/IfConditions.golden b/test/cctest/interpreter/bytecode_expectations/IfConditions.golden
@@ -3,7 +3,6 @@
 #
 
 ---
-execute: yes
 wrap: no
 test function name: f
 

diff --git a/test/cctest/interpreter/bytecode_expectations/IntegerConstants.golden b/test/cctest/interpreter/bytecode_expectations/IntegerConstants.golden
@@ -3,7 +3,6 @@
 #
 
 ---
-execute: yes
 wrap: yes
 
 ---

diff --git a/test/cctest/interpreter/bytecode_expectations/JumpsRequiringConstantWideOperands.golden b/test/cctest/interpreter/bytecode_expectations/JumpsRequiringConstantWideOperands.golden
@@ -3,7 +3,6 @@
 #
 
 ---
-execute: yes
 wrap: yes
 
 ---

diff --git a/test/cctest/interpreter/bytecode_expectations/LetVariable.golden b/test/cctest/interpreter/bytecode_expectations/LetVariable.golden
@@ -3,7 +3,6 @@
 #
 
 ---
-execute: yes
 wrap: yes
 
 ---

diff --git a/test/cctest/interpreter/bytecode_expectations/LetVariableContextSlot.golden b/test/cctest/interpreter/bytecode_expectations/LetVariableContextSlot.golden
@@ -3,7 +3,6 @@
 #
 
 ---
-execute: yes
 wrap: yes
 
 ---

diff --git a/test/cctest/interpreter/bytecode_expectations/LoadGlobal.golden b/test/cctest/interpreter/bytecode_expectations/LoadGlobal.golden
@@ -3,7 +3,6 @@
 #
 
 ---
-execute: yes
 wrap: no
 test function name: f
 

diff --git a/test/cctest/interpreter/bytecode_expectations/LogicalExpressions.golden b/test/cctest/interpreter/bytecode_expectations/LogicalExpressions.golden
@@ -3,7 +3,6 @@
 #
 
 ---
-execute: yes
 wrap: yes
 
 ---

diff --git a/test/cctest/interpreter/bytecode_expectations/LookupSlot.golden b/test/cctest/interpreter/bytecode_expectations/LookupSlot.golden
@@ -3,7 +3,6 @@
 #
 
 ---
-execute: yes
 wrap: yes
 test function name: f