Index: src/code-stubs-hydrogen.cc |
diff --git a/src/code-stubs-hydrogen.cc b/src/code-stubs-hydrogen.cc |
index 9f9b14e309d975f15c77020d72a6e38b8e3e0a28..9ab210af249989f7b58d22e3ae551c9fb2de8488 100644 |
--- a/src/code-stubs-hydrogen.cc |
+++ b/src/code-stubs-hydrogen.cc |
@@ -1667,12 +1667,15 @@ void CodeStubGraphBuilderBase::BuildCheckAndInstallOptimizedCode( |
optimized_map, map_index, SharedFunctionInfo::kContextOffset); |
HValue* osr_ast_slot = LoadFromOptimizedCodeMap( |
optimized_map, map_index, SharedFunctionInfo::kOsrAstIdOffset); |
+ HValue* code_object = LoadFromOptimizedCodeMap( |
+ optimized_map, map_index, SharedFunctionInfo::kCachedCodeOffset); |
builder->If<HCompareObjectEqAndBranch>(native_context, |
context_slot); |
builder->AndIf<HCompareObjectEqAndBranch>(osr_ast_slot, osr_ast_id_none); |
+ builder->And(); |
+ builder->IfNot<HCompareObjectEqAndBranch>(code_object, |
+ graph()->GetConstant0()); |
builder->Then(); |
- HValue* code_object = LoadFromOptimizedCodeMap(optimized_map, |
- map_index, SharedFunctionInfo::kCachedCodeOffset); |
// and the literals |
Michael Starzinger
2015/09/22 10:44:39
nit: This comment doesn't provide any value anymor
Igor Sheludko
2015/09/22 12:58:10
Done.
|
HValue* literals = LoadFromOptimizedCodeMap(optimized_map, |
map_index, SharedFunctionInfo::kLiteralsOffset); |