From a26a9b74abfc3561532a28e4a1c49303eee61e2b Mon Sep 17 00:00:00 2001 From: "erik.corry@gmail.com" Date: Fri, 24 Sep 2010 09:35:19 +0000 Subject: [PATCH] Revert 5520 due to compilation failure. git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@5521 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/x64/full-codegen-x64.cc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/x64/full-codegen-x64.cc b/src/x64/full-codegen-x64.cc index 01a788c..c15860c 100644 --- a/src/x64/full-codegen-x64.cc +++ b/src/x64/full-codegen-x64.cc @@ -375,10 +375,10 @@ void FullCodeGenerator::AccumulatorValueContext::Plug( Label* materialize_false) const { NearLabel done; __ bind(materialize_true); - __ LoadRoot(result_register(), Heap::kTrueValueRootIndex); + __ Move(result_register(), Factory::true_value()); __ jmp(&done); __ bind(materialize_false); - __ LoadRoot(result_register(), Heap::kFalseValueRootIndex); + __ Move(result_register(), Factory::false_value()); __ bind(&done); } @@ -388,10 +388,10 @@ void FullCodeGenerator::StackValueContext::Plug( Label* materialize_false) const { NearLabel done; __ bind(materialize_true); - __ PushRoot(Heap::kTrueValueRootIndex); + __ Push(Factory::true_value()); __ jmp(&done); __ bind(materialize_false); - __ PushRoot(Heap::kFalseValueRootIndex); + __ Push(Factory::false_value()); __ bind(&done); } @@ -2250,12 +2250,12 @@ void FullCodeGenerator::EmitClassOf(ZoneList* args) { // Functions have class 'Function'. __ bind(&function); - __ LoadRoot(rax, Heap::kFunctionClassSymbolRootIndex); + __ Move(rax, Factory::function_class_symbol()); __ jmp(&done); // Objects with a non-function constructor have class 'Object'. __ bind(&non_function_constructor); - __ LoadRoot(rax, Heap::kObjectSymbolRootIndex); + __ Move(rax, Factory::Object_symbol()); __ jmp(&done); // Non-JS objects have class null. @@ -2710,10 +2710,10 @@ void FullCodeGenerator::EmitIsRegExpEquivalent(ZoneList* args) { __ cmpq(tmp, FieldOperand(right, JSRegExp::kDataOffset)); __ j(equal, &ok); __ bind(&fail); - __ LoadRoot(rax, Heap::kFalseValueRootIndex); + __ Move(rax, Factory::false_value()); __ jmp(&done); __ bind(&ok); - __ LoadRoot(rax, Heap::kTrueValueRootIndex); + __ Move(rax, Factory::true_value()); __ bind(&done); context()->Plug(rax); -- 2.7.4