From: sgjesse@chromium.org <sgjesse@chromium.org@ce2b1a6d-e550-0410-aec6-3dcde31c8c00>
Date: Fri, 14 May 2010 13:53:26 +0000 (+0000)
Subject: Modified codegen-arm.cc to no longer use V8_NATIVE_REGEXP, but to use
X-Git-Tag: upstream/4.7.83~21805
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3a7bf0884763a1e70699e2145ad739d626674a6b;p=platform%2Fupstream%2Fv8.git

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
---

diff --git a/src/arm/codegen-arm.cc b/src/arm/codegen-arm.cc
index 0dfbc7a..68ae026 100644
--- a/src/arm/codegen-arm.cc
+++ b/src/arm/codegen-arm.cc
@@ -8539,9 +8539,9 @@ void RegExpExecStub::Generate(MacroAssembler* masm) {
   // 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
   // at compilation.
-#ifndef V8_NATIVE_REGEXP
+#ifdef V8_INTERPRETED_REGEXP
   __ TailCallRuntime(Runtime::kRegExpExec, 4, 1);
-#else  // V8_NATIVE_REGEXP
+#else  // V8_INTERPRETED_REGEXP
   if (!FLAG_regexp_entry_native) {
     __ TailCallRuntime(Runtime::kRegExpExec, 4, 1);
     return;
@@ -8874,7 +8874,7 @@ void RegExpExecStub::Generate(MacroAssembler* masm) {
   // Do the runtime call to execute the regexp.
   __ bind(&runtime);
   __ TailCallRuntime(Runtime::kRegExpExec, 4, 1);
-#endif  // V8_NATIVE_REGEXP
+#endif  // V8_INTERPRETED_REGEXP
 }