Index: src/hydrogen.cc |
diff --git a/src/hydrogen.cc b/src/hydrogen.cc |
index a774f60129184fd6cf08f338cef5183bcfd6c362..176085bbfe77b46083a89869c9167257823f784d 100644 |
--- a/src/hydrogen.cc |
+++ b/src/hydrogen.cc |
@@ -2076,9 +2076,10 @@ HValue* HGraphBuilder::BuildUncheckedStringAdd( |
// Fallback to the runtime to add the two strings. |
Add<HPushArgument>(left); |
Add<HPushArgument>(right); |
- Push(Add<HCallRuntime>(isolate()->factory()->empty_string(), |
- Runtime::FunctionForId(Runtime::kStringAdd), |
- 2)); |
+ Push(Add<HCallRuntime>( |
+ isolate()->factory()->empty_string(), |
+ Runtime::FunctionForId(Runtime::kHiddenStringAdd), |
+ 2)); |
} |
if_sameencodingandsequential.End(); |
} |
@@ -8408,6 +8409,7 @@ void HOptimizedGraphBuilder::VisitCallNew(CallNew* expr) { |
const HOptimizedGraphBuilder::InlineFunctionGenerator |
HOptimizedGraphBuilder::kInlineFunctionGenerators[] = { |
INLINE_FUNCTION_LIST(INLINE_FUNCTION_GENERATOR_ADDRESS) |
+ INLINE_OPTIMIZED_FUNCTION_LIST(INLINE_FUNCTION_GENERATOR_ADDRESS) |
}; |
#undef INLINE_FUNCTION_GENERATOR_ADDRESS |
@@ -8734,7 +8736,8 @@ void HOptimizedGraphBuilder::VisitCallRuntime(CallRuntime* expr) { |
const Runtime::Function* function = expr->function(); |
ASSERT(function != NULL); |
- if (function->intrinsic_type == Runtime::INLINE) { |
+ if (function->intrinsic_type == Runtime::INLINE || |
+ function->intrinsic_type == Runtime::INLINE_OPTIMIZED) { |
ASSERT(expr->name()->length() > 0); |
ASSERT(expr->name()->Get(0) == '_'); |
// Call to an inline function. |