src/hydrogen.cc - Issue 6929066: First step in letting Crankshaft inline functions with a different context.

Unified Diff: src/hydrogen.cc

Issue 6929066: First step in letting Crankshaft inline functions with a different context. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge

Patch Set: Created 9 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

View side-by-side diff with in-line comments

Index: src/hydrogen.cc

diff --git a/src/hydrogen.cc b/src/hydrogen.cc

index a0d783791260f3a96d9d411057548ac471b690b6..d9af5ca2439cdced28121b27ad95cef797503fbd 100644

--- a/src/hydrogen.cc

+++ b/src/hydrogen.cc

@@ -248,10 +248,11 @@ void HBasicBlock::RegisterPredecessor(HBasicBlock* pred) {

ASSERT(IsLoopHeader() || first_ == NULL);

HEnvironment* incoming_env = pred->last_environment();

if (IsLoopHeader()) {

- ASSERT(phis()->length() == incoming_env->length());

- for (int i = 0; i < phis_.length(); ++i) {

- phis_[i]->AddInput(incoming_env->values()->at(i));

+ int phi_index = 0;

+ for (int i = 0; i < incoming_env->length(); ++i) {

+ phis_[phi_index++]->AddInput(incoming_env->values()->at(i));

}

+ ASSERT_EQ(phi_index, phis_.length());

} else {

last_environment()->AddIncomingEdge(this, pred->last_environment());

}

@@ -2229,14 +2230,21 @@ void HGraphBuilder::SetupScope(Scope* scope) {

// Set the initial values of parameters including "this". "This" has

// parameter index 0.

- int count = scope->num_parameters() + 1;

- for (int i = 0; i < count; ++i) {

+ ASSERT_EQ(scope->num_parameters() + 1, environment()->parameter_count());

+ for (int i = 0; i < environment()->parameter_count(); ++i) {

HInstruction* parameter = AddInstruction(new(zone()) HParameter(i));

environment()->Bind(i, parameter);

}

- // Set the initial values of stack-allocated locals.

- for (int i = count; i < environment()->length(); ++i) {

+ // First special is HContext.

+ HInstruction* context = AddInstruction(new(zone()) HContext());

Kevin Millikin (Chromium) 2011/05/06 12:29:45 I like to write new(zone()) HContext.

+ environment()->Bind(environment()->parameter_count(), context);

Kevin Millikin (Chromium) 2011/05/06 12:29:45 environment()->BindContext(context)

+ // Initialize specials and locals to undefined.

+ for (int i = environment()->parameter_count() + 1;

+ i < environment()->length();

+ ++i) {

environment()->Bind(i, undefined_constant);

}

@@ -2594,16 +2602,20 @@ void HGraphBuilder::PreProcessOsrEntry(IterationStatement* statement) {

// We want the correct environment at the OsrEntry instruction. Build

// it explicitly. The expression stack should be empty.

int count = environment()->length();

- ASSERT(count ==

- (environment()->parameter_count() + environment()->local_count()));

+ ASSERT(count == (environment()->parameter_count() +

Kevin Millikin (Chromium) 2011/05/06 12:29:45 ASSERT(environment()->ExpressionStackIsEmpty())

+ environment()->specials_count() +

+ environment()->local_count()));

for (int i = 0; i < count; ++i) {

- HUnknownOSRValue* unknown = new(zone()) HUnknownOSRValue;

- AddInstruction(unknown);

- environment()->Bind(i, unknown);

+ HUnknownOSRValue* osr_value = new(zone()) HUnknownOSRValue;

+ AddInstruction(osr_value);

+ environment()->Bind(i, osr_value);

}

AddSimulate(osr_entry_id);

AddInstruction(new(zone()) HOsrEntry(osr_entry_id));

+ HContext* context = new(zone()) HContext;

+ AddInstruction(context);

+ environment()->Bind(environment()->parameter_count(), context);

Kevin Millikin (Chromium) 2011/05/06 12:29:45 environment()->BindContext(context)

current_block()->Goto(loop_predecessor);

loop_predecessor->SetJoinId(statement->EntryId());

set_current_block(loop_predecessor);

@@ -2886,12 +2898,12 @@ HGraphBuilder::GlobalPropertyAccess HGraphBuilder::LookupGlobalProperty(

HValue* HGraphBuilder::BuildContextChainWalk(Variable* var) {

ASSERT(var->IsContextSlot());

- HInstruction* context = new(zone()) HContext;

- AddInstruction(context);

+ HValue* context = environment()->LookupContext();

int length = info()->scope()->ContextChainLength(var->scope());

while (length-- > 0) {

- context = new(zone()) HOuterContext(context);

- AddInstruction(context);

+ HInstruction* context_instruction = new(zone()) HOuterContext(context);

+ AddInstruction(context_instruction);

+ context = context_instruction;

}

return context;

}

@@ -2930,8 +2942,7 @@ void HGraphBuilder::VisitVariableProxy(VariableProxy* expr) {

HLoadGlobalCell* instr = new(zone()) HLoadGlobalCell(cell, check_hole);

ast_context()->ReturnInstruction(instr, expr->id());

} else {

- HContext* context = new(zone()) HContext;

- AddInstruction(context);

+ HValue* context = environment()->LookupContext();

HGlobalObject* global_object = new(zone()) HGlobalObject(context);

AddInstruction(global_object);

HLoadGlobalGeneric* instr =

@@ -2974,8 +2985,7 @@ void HGraphBuilder::VisitObjectLiteral(ObjectLiteral* expr) {

ASSERT(!HasStackOverflow());

ASSERT(current_block() != NULL);

ASSERT(current_block()->HasPredecessor());

- HContext* context = new(zone()) HContext;

- AddInstruction(context);

+ HValue* context = environment()->LookupContext();

HObjectLiteral* literal =

new(zone()) HObjectLiteral(context,

expr->constant_properties(),

@@ -3157,8 +3167,7 @@ HInstruction* HGraphBuilder::BuildStoreNamedField(HValue* object,

HInstruction* HGraphBuilder::BuildStoreNamedGeneric(HValue* object,

Handle<String> name,

HValue* value) {

- HContext* context = new(zone()) HContext;

- AddInstruction(context);

+ HValue* context = environment()->LookupContext();

return new(zone()) HStoreNamedGeneric(

context,

object,

@@ -3334,8 +3343,7 @@ void HGraphBuilder::HandleGlobalVariableAssignment(Variable* var,

AddInstruction(instr);

if (instr->HasSideEffects()) AddSimulate(ast_id);

} else {

- HContext* context = new(zone()) HContext;

- AddInstruction(context);

+ HValue* context = environment()->LookupContext();

HGlobalObject* global_object = new(zone()) HGlobalObject(context);

AddInstruction(global_object);

HStoreGlobalGeneric* instr =

@@ -3560,8 +3568,7 @@ HInstruction* HGraphBuilder::BuildLoadNamedGeneric(HValue* obj,

Property* expr) {

ASSERT(expr->key()->IsPropertyName());

Handle<Object> name = expr->key()->AsLiteral()->handle();

- HContext* context = new(zone()) HContext;

- AddInstruction(context);

+ HValue* context = environment()->LookupContext();

return new(zone()) HLoadNamedGeneric(context, obj, name);

}

@@ -3591,8 +3598,7 @@ HInstruction* HGraphBuilder::BuildLoadNamed(HValue* obj,

HInstruction* HGraphBuilder::BuildLoadKeyedGeneric(HValue* object,

HValue* key) {

- HContext* context = new(zone()) HContext;

- AddInstruction(context);

+ HValue* context = environment()->LookupContext();

return new(zone()) HLoadKeyedGeneric(context, object, key);

}

@@ -3667,8 +3673,7 @@ HInstruction* HGraphBuilder::BuildLoadKeyed(HValue* obj,

HInstruction* HGraphBuilder::BuildStoreKeyedGeneric(HValue* object,

HValue* key,

HValue* value) {

- HContext* context = new(zone()) HContext;

- AddInstruction(context);

+ HValue* context = environment()->LookupContext();

return new(zone()) HStoreKeyedGeneric(

context,

object,

@@ -3921,8 +3926,7 @@ void HGraphBuilder::HandlePolymorphicCallNamed(Call* expr,

if (count == types->length() && FLAG_deoptimize_uncommon_cases) {

current_block()->FinishExitWithDeoptimization();

} else {

- HContext* context = new(zone()) HContext;

- AddInstruction(context);

+ HValue* context = environment()->LookupContext();

HCallNamed* call = new(zone()) HCallNamed(context, name, argument_count);

call->set_position(expr->position());

PreProcessCall(call);

@@ -4116,6 +4120,7 @@ bool HGraphBuilder::TryInline(Call* expr) {

body_entry->SetJoinId(expr->ReturnId());

set_current_block(body_entry);

AddInstruction(new(zone()) HEnterInlined(target, function));

+ // AddInstruction(environment()->LookupContext());

Kevin Millikin (Chromium) 2011/05/06 12:29:45 Remove me.

VisitStatements(function->body());

if (HasStackOverflow()) {

// Bail out if the inline function did, as we cannot residualize a call

@@ -4349,8 +4354,7 @@ void HGraphBuilder::VisitCall(Call* expr) {

CHECK_ALIVE(VisitExpressions(expr->arguments()));

- HContext* context = new(zone()) HContext;

- AddInstruction(context);

+ HValue* context = environment()->LookupContext();

call = PreProcessCall(

new(zone()) HCallKeyed(context, key, argument_count));

call->set_position(expr->position());

@@ -4389,8 +4393,7 @@ void HGraphBuilder::VisitCall(Call* expr) {

// When the target has a custom call IC generator, use the IC,

// because it is likely to generate better code. Also use the IC

// when a primitive receiver check is required.

- HContext* context = new(zone()) HContext;

- AddInstruction(context);

+ HValue* context = environment()->LookupContext();

call = PreProcessCall(

new(zone()) HCallNamed(context, name, argument_count));

} else {

@@ -4407,8 +4410,7 @@ void HGraphBuilder::VisitCall(Call* expr) {

return;

} else {

- HContext* context = new(zone()) HContext;

- AddInstruction(context);

+ HValue* context = environment()->LookupContext();

call = PreProcessCall(

new(zone()) HCallNamed(context, name, argument_count));

}

@@ -4437,9 +4439,8 @@ void HGraphBuilder::VisitCall(Call* expr) {

if (known_global_function) {

// Push the global object instead of the global receiver because

// code generated by the full code generator expects it.

- HContext* context = new(zone()) HContext;

+ HValue* context = environment()->LookupContext();

HGlobalObject* global_object = new(zone()) HGlobalObject(context);

- AddInstruction(context);

PushAndAdd(global_object);

CHECK_ALIVE(VisitExpressions(expr->arguments()));

@@ -4461,8 +4462,7 @@ void HGraphBuilder::VisitCall(Call* expr) {

call = PreProcessCall(new(zone()) HCallKnownGlobal(expr->target(),

argument_count));

} else {

- HContext* context = new(zone()) HContext;

- AddInstruction(context);

+ HValue* context = environment()->LookupContext();

PushAndAdd(new(zone()) HGlobalObject(context));

CHECK_ALIVE(VisitExpressions(expr->arguments()));

@@ -4472,9 +4472,8 @@ void HGraphBuilder::VisitCall(Call* expr) {

}

} else {

- HContext* context = new(zone()) HContext;

+ HValue* context = environment()->LookupContext();

HGlobalObject* global_object = new(zone()) HGlobalObject(context);

- AddInstruction(context);

AddInstruction(global_object);

PushAndAdd(new(zone()) HGlobalReceiver(global_object));

CHECK_ALIVE(VisitExpressions(expr->arguments()));

@@ -4497,8 +4496,7 @@ void HGraphBuilder::VisitCallNew(CallNew* expr) {

CHECK_ALIVE(VisitForValue(expr->expression()));

CHECK_ALIVE(VisitExpressions(expr->arguments()));

- HContext* context = new(zone()) HContext;

- AddInstruction(context);

+ HValue* context = environment()->LookupContext();

// The constructor is both an operand to the instruction and an argument

// to the construct call.

@@ -5121,8 +5119,7 @@ void HGraphBuilder::VisitCompareOperation(CompareOperation* expr) {

// If the target is not null we have found a known global function that is

// assumed to stay the same for this instanceof.

if (target.is_null()) {

- HContext* context = new(zone()) HContext;

- AddInstruction(context);

+ HValue* context = environment()->LookupContext();

instr = new(zone()) HInstanceOf(context, left, right);

} else {

AddInstruction(new(zone()) HCheckFunction(right, target));

@@ -5398,8 +5395,7 @@ void HGraphBuilder::GenerateRandomHeapNumber(CallRuntime* call) {

void HGraphBuilder::GenerateStringAdd(CallRuntime* call) {

ASSERT_EQ(2, call->arguments()->length());

CHECK_ALIVE(VisitArgumentList(call->arguments()));

- HContext* context = new(zone()) HContext;

- AddInstruction(context);

+ HValue* context = environment()->LookupContext();

HCallStub* result = new(zone()) HCallStub(context, CodeStub::StringAdd, 2);

Drop(2);

ast_context()->ReturnInstruction(result, call->id());

@@ -5410,8 +5406,7 @@ void HGraphBuilder::GenerateStringAdd(CallRuntime* call) {

void HGraphBuilder::GenerateSubString(CallRuntime* call) {

ASSERT_EQ(3, call->arguments()->length());

CHECK_ALIVE(VisitArgumentList(call->arguments()));

- HContext* context = new(zone()) HContext;

- AddInstruction(context);

+ HValue* context = environment()->LookupContext();

HCallStub* result = new(zone()) HCallStub(context, CodeStub::SubString, 3);

Drop(3);

ast_context()->ReturnInstruction(result, call->id());

@@ -5422,8 +5417,7 @@ void HGraphBuilder::GenerateSubString(CallRuntime* call) {

void HGraphBuilder::GenerateStringCompare(CallRuntime* call) {

ASSERT_EQ(2, call->arguments()->length());

CHECK_ALIVE(VisitArgumentList(call->arguments()));

- HContext* context = new(zone()) HContext;

- AddInstruction(context);

+ HValue* context = environment()->LookupContext();

HCallStub* result =

new(zone()) HCallStub(context, CodeStub::StringCompare, 2);

Drop(2);

@@ -5435,8 +5429,7 @@ void HGraphBuilder::GenerateStringCompare(CallRuntime* call) {

void HGraphBuilder::GenerateRegExpExec(CallRuntime* call) {

ASSERT_EQ(4, call->arguments()->length());

CHECK_ALIVE(VisitArgumentList(call->arguments()));

- HContext* context = new(zone()) HContext;

- AddInstruction(context);

+ HValue* context = environment()->LookupContext();

HCallStub* result = new(zone()) HCallStub(context, CodeStub::RegExpExec, 4);

Drop(4);

ast_context()->ReturnInstruction(result, call->id());

@@ -5447,8 +5440,7 @@ void HGraphBuilder::GenerateRegExpExec(CallRuntime* call) {

void HGraphBuilder::GenerateRegExpConstructResult(CallRuntime* call) {

ASSERT_EQ(3, call->arguments()->length());

CHECK_ALIVE(VisitArgumentList(call->arguments()));

- HContext* context = new(zone()) HContext;

- AddInstruction(context);

+ HValue* context = environment()->LookupContext();

HCallStub* result =

new(zone()) HCallStub(context, CodeStub::RegExpConstructResult, 3);

Drop(3);

@@ -5466,8 +5458,7 @@ void HGraphBuilder::GenerateGetFromCache(CallRuntime* call) {

void HGraphBuilder::GenerateNumberToString(CallRuntime* call) {

ASSERT_EQ(1, call->arguments()->length());

CHECK_ALIVE(VisitArgumentList(call->arguments()));

- HContext* context = new(zone()) HContext;

- AddInstruction(context);

+ HValue* context = environment()->LookupContext();

HCallStub* result =

new(zone()) HCallStub(context, CodeStub::NumberToString, 1);

Drop(1);

@@ -5494,8 +5485,7 @@ void HGraphBuilder::GenerateCallFunction(CallRuntime* call) {

}

CHECK_ALIVE(VisitForValue(call->arguments()->last()));

HValue* function = Pop();

- HContext* context = new HContext;

- AddInstruction(context);

+ HValue* context = environment()->LookupContext();

HInvokeFunction* result =

new(zone()) HInvokeFunction(context, function, arg_count);

Drop(arg_count);

@@ -5518,8 +5508,7 @@ void HGraphBuilder::GenerateMathPow(CallRuntime* call) {

void HGraphBuilder::GenerateMathSin(CallRuntime* call) {

ASSERT_EQ(1, call->arguments()->length());

CHECK_ALIVE(VisitArgumentList(call->arguments()));

- HContext* context = new(zone()) HContext;

- AddInstruction(context);

+ HValue* context = environment()->LookupContext();

HCallStub* result =

new(zone()) HCallStub(context, CodeStub::TranscendentalCache, 1);

result->set_transcendental_type(TranscendentalCache::SIN);

@@ -5531,8 +5520,7 @@ void HGraphBuilder::GenerateMathSin(CallRuntime* call) {

void HGraphBuilder::GenerateMathCos(CallRuntime* call) {

ASSERT_EQ(1, call->arguments()->length());

CHECK_ALIVE(VisitArgumentList(call->arguments()));

- HContext* context = new(zone()) HContext;

- AddInstruction(context);

+ HValue* context = environment()->LookupContext();

HCallStub* result =

new(zone()) HCallStub(context, CodeStub::TranscendentalCache, 1);

result->set_transcendental_type(TranscendentalCache::COS);

@@ -5544,8 +5532,7 @@ void HGraphBuilder::GenerateMathCos(CallRuntime* call) {

void HGraphBuilder::GenerateMathLog(CallRuntime* call) {

ASSERT_EQ(1, call->arguments()->length());

CHECK_ALIVE(VisitArgumentList(call->arguments()));

- HContext* context = new(zone()) HContext;

- AddInstruction(context);

+ HValue* context = environment()->LookupContext();

HCallStub* result =

new(zone()) HCallStub(context, CodeStub::TranscendentalCache, 1);

result->set_transcendental_type(TranscendentalCache::LOG);

@@ -5590,6 +5577,7 @@ HEnvironment::HEnvironment(HEnvironment* outer,

values_(0),

assigned_variables_(4),

parameter_count_(0),

+ specials_count_(1),

local_count_(0),

outer_(outer),

pop_count_(0),

@@ -5603,6 +5591,7 @@ HEnvironment::HEnvironment(const HEnvironment* other)

: values_(0),

assigned_variables_(0),

parameter_count_(0),

+ specials_count_(1),

local_count_(0),

outer_(NULL),

pop_count_(0),

@@ -5619,7 +5608,7 @@ void HEnvironment::Initialize(int parameter_count,

local_count_ = local_count;

// Avoid reallocating the temporaries' backing store on the first Push.

- int total = parameter_count + local_count + stack_height;

+ int total = parameter_count + specials_count_ + local_count + stack_height;

values_.Initialize(total + 4);

for (int i = 0; i < total; ++i) values_.Add(NULL);

}

@@ -5678,12 +5667,12 @@ void HEnvironment::Bind(int index, HValue* value) {

bool HEnvironment::HasExpressionAt(int index) const {

- return index >= parameter_count_ + local_count_;

+ return index >= parameter_count_ + specials_count_ + local_count_;

}

bool HEnvironment::ExpressionStackIsEmpty() const {

- int first_expression = parameter_count() + local_count();

+ int first_expression = parameter_count() + specials_count() + local_count();

ASSERT(length() >= first_expression);

return length() == first_expression;

}

@@ -5762,10 +5751,15 @@ HEnvironment* HEnvironment::CopyForInlining(Handle<JSFunction> target,

}

- // Initialize the stack-allocated locals to undefined.

+ // Initialize the stack-allocated locals and specials to undefined.

int local_base = arity + 1;

- int local_count = function->scope()->num_stack_slots();

- for (int i = 0; i < local_count; ++i) {

+ int local_count = function->scope()->num_stack_slots() + specials_count();

Kevin Millikin (Chromium) 2011/05/06 12:29:45 Don't call these local_base and local_count since

+ // HContext* inner_context = new(zone) HContext;

Kevin Millikin (Chromium) 2011/05/06 12:29:45 Remove me.

+ // This HContext will be added to the graph by the caller of this function.

Kevin Millikin (Chromium) 2011/05/06 12:29:45 Comment is probably unnecessary, we don't say this

+ inner->SetValueAt(local_base, outer->LookupContext());

+ for (int i = 1; i < local_count; ++i) {

inner->SetValueAt(local_base + i, undefined);

}

@@ -5777,8 +5771,11 @@ HEnvironment* HEnvironment::CopyForInlining(Handle<JSFunction> target,

void HEnvironment::PrintTo(StringStream* stream) {

for (int i = 0; i < length(); i++) {

if (i == 0) stream->Add("parameters\n");

- if (i == parameter_count()) stream->Add("locals\n");

- if (i == parameter_count() + local_count()) stream->Add("expressions");

+ if (i == parameter_count()) stream->Add("specials\n");

+ if (i == parameter_count() + specials_count()) stream->Add("locals\n");

+ if (i == parameter_count() + specials_count() + local_count()) {

+ stream->Add("expressions");

+ }

HValue* val = values_.at(i);

stream->Add("%d: ", i);

if (val != NULL) {

« src/hydrogen.h ('K') | « src/hydrogen.h ('k') | src/hydrogen-instructions.h » ('j') | src/ia32/lithium-ia32.cc » ('J')