Revision: 9643
Author: [email protected]
Date: Mon Oct 17 02:02:26 2011
Log: Remove redundant allow-natives flag from CompilationInfo.
Just use script being native and FLAG_allow_natives_syntax directly.
Review URL: http://codereview.chromium.org/8314018
http://code.google.com/p/v8/source/detail?r=9643
Modified:
/branches/bleeding_edge/src/compiler.cc
/branches/bleeding_edge/src/compiler.h
/branches/bleeding_edge/src/parser.cc
/branches/bleeding_edge/test/mjsunit/regress/regress-1521.js
=======================================
--- /branches/bleeding_edge/src/compiler.cc Wed Oct 12 05:23:06 2011
+++ /branches/bleeding_edge/src/compiler.cc Mon Oct 17 02:02:26 2011
@@ -516,9 +516,6 @@
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);
=======================================
--- /branches/bleeding_edge/src/compiler.h Sat Oct 1 01:47:12 2011
+++ /branches/bleeding_edge/src/compiler.h Mon Oct 17 02:02:26 2011
@@ -83,12 +83,6 @@
ASSERT(is_lazy());
flags_ |= IsInLoop::encode(true);
}
- void MarkAsAllowingNativesSyntax() {
- flags_ |= IsNativesSyntaxAllowed::encode(true);
- }
- bool allows_natives_syntax() const {
- return IsNativesSyntaxAllowed::decode(flags_);
- }
void MarkAsNative() {
flags_ |= IsNative::encode(true);
}
@@ -199,8 +193,6 @@
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> {};
=======================================
--- /branches/bleeding_edge/src/parser.cc Fri Oct 14 05:03:53 2011
+++ /branches/bleeding_edge/src/parser.cc Mon Oct 17 02:02:26 2011
@@ -5196,13 +5196,16 @@
Handle<Script> script = info->script();
bool harmony_scoping = !info->is_native() && FLAG_harmony_scoping;
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);
parser.SetHarmonyScoping(harmony_scoping);
result = parser.ParseLazy(info);
} else {
// Whether we allow %identifier(..) syntax.
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,
=======================================
--- /branches/bleeding_edge/test/mjsunit/regress/regress-1521.js Fri Jul 1
07:05:46 2011
+++ /branches/bleeding_edge/test/mjsunit/regress/regress-1521.js Mon Oct 17
02:02:26 2011
@@ -24,6 +24,8 @@
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Flags: --allow-natives-syntax
// Optimized variable access inside through a catch context should work.
function test(x) {
@@ -44,4 +46,3 @@
}
test(3);
-
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
