Index: runtime/vm/code_generator_test.cc |
diff --git a/runtime/vm/code_generator_test.cc b/runtime/vm/code_generator_test.cc |
index 0d0f3f5aa0174d517f295a5f2ba72c34e64be2a3..05b084c9cc0145d944a2c01971454ed0aec5ff96 100644 |
--- a/runtime/vm/code_generator_test.cc |
+++ b/runtime/vm/code_generator_test.cc |
@@ -5,12 +5,12 @@ |
#include "platform/globals.h" |
#include "platform/assert.h" |
-#include "vm/globals.h" |
#include "vm/assembler.h" |
#include "vm/ast.h" |
#include "vm/class_finalizer.h" |
#include "vm/compiler.h" |
#include "vm/dart_entry.h" |
+#include "vm/globals.h" |
#include "vm/native_entry.h" |
#include "vm/native_entry_test.h" |
#include "vm/runtime_entry.h" |
@@ -22,20 +22,17 @@ namespace dart { |
static const TokenPosition kPos = TokenPosition::kMinSource; |
- |
CODEGEN_TEST_GENERATE(SimpleReturnCodegen, test) { |
test->node_sequence()->Add(new ReturnNode(kPos)); |
} |
CODEGEN_TEST_RUN(SimpleReturnCodegen, Instance::null()) |
- |
CODEGEN_TEST_GENERATE(SmiReturnCodegen, test) { |
LiteralNode* l = new LiteralNode(kPos, Smi::ZoneHandle(Smi::New(3))); |
test->node_sequence()->Add(new ReturnNode(kPos, l)); |
} |
CODEGEN_TEST_RUN(SmiReturnCodegen, Smi::New(3)) |
- |
CODEGEN_TEST2_GENERATE(SimpleStaticCallCodegen, function, test) { |
// Wrap the SmiReturnCodegen test above as a static function and call it. |
ArgumentListNode* no_arguments = new ArgumentListNode(kPos); |
@@ -44,7 +41,6 @@ CODEGEN_TEST2_GENERATE(SimpleStaticCallCodegen, function, test) { |
} |
CODEGEN_TEST2_RUN(SimpleStaticCallCodegen, SmiReturnCodegen, Smi::New(3)) |
- |
// Helper to allocate and return a LocalVariable. |
static LocalVariable* NewTestLocalVariable(const char* name) { |
const String& variable_name = |
@@ -53,7 +49,6 @@ static LocalVariable* NewTestLocalVariable(const char* name) { |
return new LocalVariable(kPos, kPos, variable_name, variable_type); |
} |
- |
CODEGEN_TEST_GENERATE(ReturnParameterCodegen, test) { |
SequenceNode* node_seq = test->node_sequence(); |
const int num_params = 1; |
@@ -67,7 +62,6 @@ CODEGEN_TEST_GENERATE(ReturnParameterCodegen, test) { |
node_seq->Add(new ReturnNode(kPos, new LoadLocalNode(kPos, parameter))); |
} |
- |
CODEGEN_TEST2_GENERATE(StaticCallReturnParameterCodegen, function, test) { |
// Wrap and call the ReturnParameterCodegen test above as a static function. |
SequenceNode* node_seq = test->node_sequence(); |
@@ -80,7 +74,6 @@ CODEGEN_TEST2_RUN(StaticCallReturnParameterCodegen, |
ReturnParameterCodegen, |
Smi::New(3)) |
- |
CODEGEN_TEST_GENERATE(SmiParamSumCodegen, test) { |
SequenceNode* node_seq = test->node_sequence(); |
const int num_params = 2; |
@@ -103,7 +96,6 @@ CODEGEN_TEST_GENERATE(SmiParamSumCodegen, test) { |
node_seq->Add(new ReturnNode(kPos, new LoadLocalNode(kPos, sum))); |
} |
- |
CODEGEN_TEST2_GENERATE(StaticCallSmiParamSumCodegen, function, test) { |
// Wrap and call the SmiParamSumCodegen test above as a static function. |
SequenceNode* node_seq = test->node_sequence(); |
@@ -115,7 +107,6 @@ CODEGEN_TEST2_GENERATE(StaticCallSmiParamSumCodegen, function, test) { |
} |
CODEGEN_TEST2_RUN(StaticCallSmiParamSumCodegen, SmiParamSumCodegen, Smi::New(5)) |
- |
CODEGEN_TEST_GENERATE(SmiAddCodegen, test) { |
SequenceNode* node_seq = test->node_sequence(); |
LiteralNode* a = new LiteralNode(kPos, Smi::ZoneHandle(Smi::New(3))); |
@@ -125,7 +116,6 @@ CODEGEN_TEST_GENERATE(SmiAddCodegen, test) { |
} |
CODEGEN_TEST_RUN(SmiAddCodegen, Smi::New(5)) |
- |
CODEGEN_TEST_GENERATE(GenericAddCodegen, test) { |
SequenceNode* node_seq = test->node_sequence(); |
LiteralNode* a = |
@@ -139,7 +129,6 @@ CODEGEN_TEST_GENERATE(GenericAddCodegen, test) { |
} |
CODEGEN_TEST_RUN(GenericAddCodegen, Double::New(15.0)) |
- |
CODEGEN_TEST_GENERATE(SmiBinaryOpCodegen, test) { |
SequenceNode* node_seq = test->node_sequence(); |
LiteralNode* a = new LiteralNode(kPos, Smi::ZoneHandle(Smi::New(4))); |
@@ -155,7 +144,6 @@ CODEGEN_TEST_GENERATE(SmiBinaryOpCodegen, test) { |
} |
CODEGEN_TEST_RUN(SmiBinaryOpCodegen, Smi::New(3)) |
- |
CODEGEN_TEST_GENERATE(BoolNotCodegen, test) { |
SequenceNode* node_seq = test->node_sequence(); |
LiteralNode* b = new LiteralNode(kPos, Bool::False()); |
@@ -164,7 +152,6 @@ CODEGEN_TEST_GENERATE(BoolNotCodegen, test) { |
} |
CODEGEN_TEST_RUN(BoolNotCodegen, Bool::True().raw()) |
- |
CODEGEN_TEST_GENERATE(BoolAndCodegen, test) { |
SequenceNode* node_seq = test->node_sequence(); |
LiteralNode* a = new LiteralNode(kPos, Bool::True()); |
@@ -174,7 +161,6 @@ CODEGEN_TEST_GENERATE(BoolAndCodegen, test) { |
} |
CODEGEN_TEST_RUN(BoolAndCodegen, Bool::False().raw()) |
- |
CODEGEN_TEST_GENERATE(BinaryOpCodegen, test) { |
SequenceNode* node_seq = test->node_sequence(); |
LiteralNode* a = |
@@ -189,7 +175,6 @@ CODEGEN_TEST_GENERATE(BinaryOpCodegen, test) { |
} |
CODEGEN_TEST_RUN(BinaryOpCodegen, Double::New(2.5)); |
- |
CODEGEN_TEST_GENERATE(SmiUnaryOpCodegen, test) { |
SequenceNode* node_seq = test->node_sequence(); |
LiteralNode* a = new LiteralNode(kPos, Smi::ZoneHandle(Smi::New(12))); |
@@ -198,7 +183,6 @@ CODEGEN_TEST_GENERATE(SmiUnaryOpCodegen, test) { |
} |
CODEGEN_TEST_RUN(SmiUnaryOpCodegen, Smi::New(-12)) |
- |
CODEGEN_TEST_GENERATE(DoubleUnaryOpCodegen, test) { |
SequenceNode* node_seq = test->node_sequence(); |
LiteralNode* a = |
@@ -208,7 +192,6 @@ CODEGEN_TEST_GENERATE(DoubleUnaryOpCodegen, test) { |
} |
CODEGEN_TEST_RUN(DoubleUnaryOpCodegen, Double::New(-12.0)) |
- |
static Library& MakeTestLibrary(const char* url) { |
Thread* thread = Thread::Current(); |
Zone* zone = thread->zone(); |
@@ -224,14 +207,12 @@ static Library& MakeTestLibrary(const char* url) { |
return lib; |
} |
- |
static RawClass* LookupClass(const Library& lib, const char* name) { |
const String& cls_name = |
String::ZoneHandle(Symbols::New(Thread::Current(), name)); |
return lib.LookupClass(cls_name); |
} |
- |
CODEGEN_TEST_GENERATE(StaticCallCodegen, test) { |
const char* kScriptChars = |
"class A {\n" |
@@ -277,7 +258,6 @@ CODEGEN_TEST_GENERATE(StaticCallCodegen, test) { |
} |
CODEGEN_TEST_RUN(StaticCallCodegen, Smi::New(42 + 5)) |
- |
CODEGEN_TEST_GENERATE(InstanceCallCodegen, test) { |
const char* kScriptChars = |
"class A {\n" |
@@ -305,16 +285,16 @@ CODEGEN_TEST_GENERATE(InstanceCallCodegen, test) { |
String::ZoneHandle(Symbols::New(Thread::Current(), "bar")); |
ArgumentListNode* no_arguments = new ArgumentListNode(kPos); |
const TypeArguments& no_type_arguments = TypeArguments::ZoneHandle(); |
- InstanceCallNode* call_bar = new InstanceCallNode( |
- kPos, new ConstructorCallNode(kPos, no_type_arguments, constructor, |
- no_arguments), |
- function_bar_name, no_arguments); |
+ InstanceCallNode* call_bar = |
+ new InstanceCallNode(kPos, |
+ new ConstructorCallNode(kPos, no_type_arguments, |
+ constructor, no_arguments), |
+ function_bar_name, no_arguments); |
test->node_sequence()->Add(new ReturnNode(kPos, call_bar)); |
} |
CODEGEN_TEST_RUN(InstanceCallCodegen, Smi::New(42)) |
- |
// Test allocation of dart objects. |
CODEGEN_TEST_GENERATE(AllocateNewObjectCodegen, test) { |
const char* kScriptChars = |
@@ -345,7 +325,6 @@ CODEGEN_TEST_GENERATE(AllocateNewObjectCodegen, test) { |
constructor, no_arguments))); |
} |
- |
CODEGEN_TEST_RAW_RUN(AllocateNewObjectCodegen, function) { |
const Object& result = Object::Handle( |
DartEntry::InvokeFunction(function, Object::empty_array())); |