Reviewers: danno,
Description:
Port r9643 to 3.2 branch.
TBR:danno
[email protected]
Please review this at http://codereview.chromium.org/8355038/
SVN Base: https://v8.googlecode.com/svn/branches/3.2
Affected files:
M src/compiler.h
M src/compiler.cc
M src/parser.cc
M src/version.cc
Index: src/compiler.cc
diff --git a/src/compiler.cc b/src/compiler.cc
index
d8c7706cbc40387697a86beff4408a1c21e5b235..6a9bc2770adaa7e0eeee91b5a93d1024b37ec42c
100755
--- a/src/compiler.cc
+++ b/src/compiler.cc
@@ -525,7 +525,6 @@ Handle<SharedFunctionInfo>
Compiler::Compile(Handle<String> source,
info.MarkAsGlobal();
info.SetExtension(extension);
info.SetPreParseData(pre_data);
- if (natives == NATIVES_CODE) info.MarkAsAllowingNativesSyntax();
result = MakeFunctionInfo(&info);
if (extension == NULL && !result.is_null()) {
compilation_cache->PutScript(source, result);
Index: src/compiler.h
diff --git a/src/compiler.h b/src/compiler.h
index
e75e86956bb91d897ad5c3536e320d4c6c1744cf..a6a0d903990e030dd90c7b4b919273a0c895f650
100644
--- a/src/compiler.h
+++ b/src/compiler.h
@@ -83,11 +83,11 @@ class CompilationInfo BASE_EMBEDDED {
ASSERT(is_lazy());
flags_ |= IsInLoop::encode(true);
}
- void MarkAsAllowingNativesSyntax() {
- flags_ |= IsNativesSyntaxAllowed::encode(true);
+ void MarkAsNative() {
+ flags_ |= IsNative::encode(true);
}
- bool allows_natives_syntax() const {
- return IsNativesSyntaxAllowed::decode(flags_);
+ bool is_native() const {
+ return IsNative::decode(flags_);
}
void SetFunction(FunctionLiteral* literal) {
ASSERT(function_ == NULL);
@@ -163,6 +163,9 @@ class CompilationInfo BASE_EMBEDDED {
void Initialize(Mode mode) {
mode_ = V8::UseCrankshaft() ? mode : NONOPT;
+ if (script_->type()->value() == Script::TYPE_NATIVE) {
+ MarkAsNative();
+ }
if (!shared_info_.is_null() && shared_info_->strict_mode()) {
MarkAsStrictMode();
}
@@ -185,8 +188,8 @@ class CompilationInfo BASE_EMBEDDED {
class IsInLoop: public BitField<bool, 3, 1> {};
// Strict mode - used in eager compilation.
class IsStrictMode: public BitField<bool, 4, 1> {};
- // Native syntax (%-stuff) allowed?
- class IsNativesSyntaxAllowed: public BitField<bool, 5, 1> {};
+ // Is this a function from our natives.
+ class IsNative: public BitField<bool, 6, 1> {};
unsigned flags_;
Index: src/parser.cc
diff --git a/src/parser.cc b/src/parser.cc
index
266f77d578f45902c68a011283258a9ccfe275c8..ce9b7c3d0db6b40fca7ed65af680a5947a1cefb2
100644
--- a/src/parser.cc
+++ b/src/parser.cc
@@ -5141,11 +5141,14 @@ bool ParserApi::Parse(CompilationInfo* info) {
FunctionLiteral* result = NULL;
Handle<Script> script = info->script();
if (info->is_lazy()) {
- Parser parser(script, true, NULL, NULL);
+ bool allow_natives_syntax =
+ FLAG_allow_natives_syntax ||
+ info->is_native();
+ Parser parser(script, allow_natives_syntax, NULL, NULL);
result = parser.ParseLazy(info);
} else {
bool allow_natives_syntax =
- info->allows_natives_syntax() || FLAG_allow_natives_syntax;
+ info->is_native() || FLAG_allow_natives_syntax;
ScriptDataImpl* pre_data = info->pre_parse_data();
Parser parser(script, allow_natives_syntax, info->extension(),
pre_data);
if (pre_data != NULL && pre_data->has_error()) {
Index: src/version.cc
diff --git a/src/version.cc b/src/version.cc
index
e42f77c52789a67d16d2cd48c380fed6b64a8f8b..1d59be3cb7537fa168dd0baff5c7dd68b7a1be1b
100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 2
#define BUILD_NUMBER 10
-#define PATCH_LEVEL 38
+#define PATCH_LEVEL 39
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
#define IS_CANDIDATE_VERSION 0
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
