Reviewers: Yang,
Description:
Version 4.4.48.1 (cherry-pick)
Merged 8e3d776dcb5dfa75b1bc24b199465fb814bb4a0c
Revert of [V8] Use previous token location as EOS token location (patchset
#2
id:20001 of https://codereview.chromium.org/1100993003/)
BUG=chromium:480652
LOG=N
[email protected]
Please review this at https://codereview.chromium.org/1126503002/
Base URL: https://chromium.googlesource.com/v8/[email protected]
Affected files (+1, -17 lines):
M include/v8-version.h
M src/scanner.cc
M test/cctest/test-api.cc
Index: include/v8-version.h
diff --git a/include/v8-version.h b/include/v8-version.h
index
19d23b99cd4027b6efef9379906ca6af462b40af..388bc4a93a14217cdd2e0bcb8e00506628e67393
100644
--- a/include/v8-version.h
+++ b/include/v8-version.h
@@ -11,7 +11,7 @@
#define V8_MAJOR_VERSION 4
#define V8_MINOR_VERSION 4
#define V8_BUILD_NUMBER 48
-#define V8_PATCH_LEVEL 0
+#define V8_PATCH_LEVEL 1
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
Index: src/scanner.cc
diff --git a/src/scanner.cc b/src/scanner.cc
index
6187c6605edfc705e8fcacb503ba4ad2014c5e83..1dae1e42cd4c8f726cf95916205066782dc35fcd
100644
--- a/src/scanner.cc
+++ b/src/scanner.cc
@@ -225,10 +225,6 @@ static const byte one_char_tokens[] = {
Token::Value Scanner::Next() {
- if (next_.token == Token::EOS) {
- next_.location.beg_pos = current_.location.beg_pos;
- next_.location.end_pos = current_.location.end_pos;
- }
current_ = next_;
has_line_terminator_before_next_ = false;
has_multiline_comment_before_next_ = false;
Index: test/cctest/test-api.cc
diff --git a/test/cctest/test-api.cc b/test/cctest/test-api.cc
index
64583e67d83cf706bbf2c235151c18300544a7f9..f54428875c88bd95185d87015ce01a36da22c60f
100644
--- a/test/cctest/test-api.cc
+++ b/test/cctest/test-api.cc
@@ -12565,18 +12565,6 @@ THREADED_TEST(TryCatchSourceInfo) {
}
-THREADED_TEST(TryCatchSourceInfoForEOSError) {
- LocalContext context;
- v8::HandleScope scope(context->GetIsolate());
- v8::TryCatch try_catch;
- v8::Script::Compile(v8_str("!\n"));
- CHECK(try_catch.HasCaught());
- v8::Handle<v8::Message> message = try_catch.Message();
- CHECK_EQ(1, message->GetLineNumber());
- CHECK_EQ(0, message->GetStartColumn());
-}
-
-
THREADED_TEST(CompilationCache) {
LocalContext context;
v8::HandleScope scope(context->GetIsolate());
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
