Commit 3a7bf088 authored by sgjesse@chromium.org's avatar sgjesse@chromium.org

Modified codegen-arm.cc to no longer use V8_NATIVE_REGEXP, but to use

V8_INTERPRETED_REGEXP (as per Issue 1635001). 

BUG=none 
TEST=Ran v8 tests, as well as against current Chromium browser.

Review URL: http://codereview.chromium.org/2078005


git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@4655 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent 3260fb94
...@@ -8539,9 +8539,9 @@ void RegExpExecStub::Generate(MacroAssembler* masm) { ...@@ -8539,9 +8539,9 @@ void RegExpExecStub::Generate(MacroAssembler* masm) {
// Just jump directly to runtime if native RegExp is not selected at compile // Just jump directly to runtime if native RegExp is not selected at compile
// time or if regexp entry in generated code is turned off runtime switch or // time or if regexp entry in generated code is turned off runtime switch or
// at compilation. // at compilation.
#ifndef V8_NATIVE_REGEXP #ifdef V8_INTERPRETED_REGEXP
__ TailCallRuntime(Runtime::kRegExpExec, 4, 1); __ TailCallRuntime(Runtime::kRegExpExec, 4, 1);
#else // V8_NATIVE_REGEXP #else // V8_INTERPRETED_REGEXP
if (!FLAG_regexp_entry_native) { if (!FLAG_regexp_entry_native) {
__ TailCallRuntime(Runtime::kRegExpExec, 4, 1); __ TailCallRuntime(Runtime::kRegExpExec, 4, 1);
return; return;
...@@ -8874,7 +8874,7 @@ void RegExpExecStub::Generate(MacroAssembler* masm) { ...@@ -8874,7 +8874,7 @@ void RegExpExecStub::Generate(MacroAssembler* masm) {
// Do the runtime call to execute the regexp. // Do the runtime call to execute the regexp.
__ bind(&runtime); __ bind(&runtime);
__ TailCallRuntime(Runtime::kRegExpExec, 4, 1); __ TailCallRuntime(Runtime::kRegExpExec, 4, 1);
#endif // V8_NATIVE_REGEXP #endif // V8_INTERPRETED_REGEXP
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment