Diff
Modified: trunk/LayoutTests/ChangeLog (289111 => 289112)
--- trunk/LayoutTests/ChangeLog 2022-02-04 14:56:00 UTC (rev 289111)
+++ trunk/LayoutTests/ChangeLog 2022-02-04 15:47:03 UTC (rev 289112)
@@ -1,3 +1,16 @@
+2022-02-04 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, reverting r288996.
+ https://bugs.webkit.org/show_bug.cgi?id=236141
+
+ Causing debug asserts
+
+ Reverted changeset:
+
+ "No breakpoints hit on github.com, and some are invalid"
+ https://bugs.webkit.org/show_bug.cgi?id=235607
+ https://commits.webkit.org/r288996
+
2022-02-04 Sergio Villar Senin <svil...@igalia.com>
HTMLMediaElement should dispatch the resize event asynchronously
Modified: trunk/LayoutTests/inspector/debugger/breakpoints/resolved-dump-all-pause-locations-expected.txt (289111 => 289112)
--- trunk/LayoutTests/inspector/debugger/breakpoints/resolved-dump-all-pause-locations-expected.txt 2022-02-04 14:56:00 UTC (rev 289111)
+++ trunk/LayoutTests/inspector/debugger/breakpoints/resolved-dump-all-pause-locations-expected.txt 2022-02-04 15:47:03 UTC (rev 289112)
@@ -2814,82 +2814,3 @@
4
--- Running test case: Debugger.resolvedBreakpoint.dumpAllLocations.Multiline
-
-INSERTING AT: 0:0
-PAUSES AT: 1:4
- -> 0 #function test() {
- => 1 |var x;
- 2 }
- 3
- 4 // Strings
-
-INSERTING AT: 1:5
-PAUSES AT: 2:0
- 0 function test() {
- -> 1 v#ar x;
- => 2 |}
- 3
- 4 // Strings
- 5 let multiline1 = "test\
-
-INSERTING AT: 2:1
-PAUSES AT: 5:0
- 0 function test() {
- 1 var x;
- -> 2 }#
- 3
- 4 // Strings
- => 5 |let multiline1 = "test\
- 6 string", multiline2 = test();
- 7
- 8 // Template Strings
-
-INSERTING AT: 5:1
-PAUSES AT: 6:9
- 2 }
- 3
- 4 // Strings
- -> 5 l#et multiline1 = "test\
- => 6 string", |multiline2 = test();
- 7
- 8 // Template Strings
- 9 let multiline3 = `test
-
-INSERTING AT: 6:10
-PAUSES AT: 9:0
- 3
- 4 // Strings
- 5 let multiline1 = "test\
- -> 6 string", m#ultiline2 = test();
- 7
- 8 // Template Strings
- => 9 |let multiline3 = `test
- 10 string`, multiline4 = test();
- 11
- 12 // Comments
-
-INSERTING AT: 9:1
-PAUSES AT: 10:9
- 6 string", multiline2 = test();
- 7
- 8 // Template Strings
- -> 9 l#et multiline3 = `test
- => 10 string`, |multiline4 = test();
- 11
- 12 // Comments
- 13 /* test
-
-INSERTING AT: 10:10
-PAUSES AT: 14:11
- 7
- 8 // Template Strings
- 9 let multiline3 = `test
- -> 10 string`, m#ultiline4 = test();
- 11
- 12 // Comments
- 13 /* test
- => 14 comment */ |let multiline5 = test();
- 15
-
-
Modified: trunk/LayoutTests/inspector/debugger/breakpoints/resolved-dump-all-pause-locations.html (289111 => 289112)
--- trunk/LayoutTests/inspector/debugger/breakpoints/resolved-dump-all-pause-locations.html 2022-02-04 14:56:00 UTC (rev 289111)
+++ trunk/LayoutTests/inspector/debugger/breakpoints/resolved-dump-all-pause-locations.html 2022-02-04 15:47:03 UTC (rev 289112)
@@ -8,7 +8,6 @@
<script src=""
<script src=""
<script src=""
-<script src=""
<script>
function test()
{
@@ -29,11 +28,6 @@
scriptRegex: /dump-unicode\.js$/,
});
- window.addDumpAllPauseLocationsTestCase(suite, {
- name: "Debugger.resolvedBreakpoint.dumpAllLocations.Multiline",
- scriptRegex: /dump-multiline\.js$/,
- });
-
suite.runTestCasesAndFinish();
}
</script>
Deleted: trunk/LayoutTests/inspector/debugger/breakpoints/resources/dump-multiline.js (289111 => 289112)
--- trunk/LayoutTests/inspector/debugger/breakpoints/resources/dump-multiline.js 2022-02-04 14:56:00 UTC (rev 289111)
+++ trunk/LayoutTests/inspector/debugger/breakpoints/resources/dump-multiline.js 2022-02-04 15:47:03 UTC (rev 289112)
@@ -1,15 +0,0 @@
-function test() {
- var x;
-}
-
-// Strings
-let multiline1 = "test\
-string", multiline2 = test();
-
-// Template Strings
-let multiline3 = `test
-string`, multiline4 = test();
-
-// Comments
-/* test
-comment */ let multiline5 = test();
Modified: trunk/Source/_javascript_Core/ChangeLog (289111 => 289112)
--- trunk/Source/_javascript_Core/ChangeLog 2022-02-04 14:56:00 UTC (rev 289111)
+++ trunk/Source/_javascript_Core/ChangeLog 2022-02-04 15:47:03 UTC (rev 289112)
@@ -1,3 +1,16 @@
+2022-02-04 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, reverting r288996.
+ https://bugs.webkit.org/show_bug.cgi?id=236141
+
+ Causing debug asserts
+
+ Reverted changeset:
+
+ "No breakpoints hit on github.com, and some are invalid"
+ https://bugs.webkit.org/show_bug.cgi?id=235607
+ https://commits.webkit.org/r288996
+
2022-02-03 Michael Saboff <msab...@apple.com>
WebKit projects have incorrect install name for the frameworks for Catalyst builds with the system content path
Modified: trunk/Source/_javascript_Core/debugger/Breakpoint.cpp (289111 => 289112)
--- trunk/Source/_javascript_Core/debugger/Breakpoint.cpp 2022-02-04 14:56:00 UTC (rev 289111)
+++ trunk/Source/_javascript_Core/debugger/Breakpoint.cpp 2022-02-04 15:47:03 UTC (rev 289112)
@@ -65,7 +65,7 @@
ASSERT(isLinked());
ASSERT(!isResolved());
ASSERT(lineNumber >= m_lineNumber);
- ASSERT(columnNumber >= m_columnNumber || lineNumber > m_lineNumber);
+ ASSERT(columnNumber >= m_columnNumber);
m_lineNumber = lineNumber;
m_columnNumber = columnNumber;
Modified: trunk/Source/_javascript_Core/parser/Lexer.cpp (289111 => 289112)
--- trunk/Source/_javascript_Core/parser/Lexer.cpp 2022-02-04 14:56:00 UTC (rev 289111)
+++ trunk/Source/_javascript_Core/parser/Lexer.cpp 2022-02-04 15:47:03 UTC (rev 289112)
@@ -712,7 +712,6 @@
shift();
++m_lineNumber;
- m_lineStart = m_code;
}
template <typename T>
@@ -2473,8 +2472,6 @@
m_buffer8.shrink(0);
break;
case CharacterQuote: {
- auto startLineNumber = m_lineNumber;
- auto startLineStartOffset = currentLineStartOffset();
StringParseResult result = StringCannotBeParsed;
if (lexerFlags.contains(LexerFlags::DontBuildStrings))
result = parseString<false>(tokenData, strictMode);
@@ -2487,10 +2484,8 @@
}
shift();
token = STRING;
- m_atLineStart = false;
- fillTokenInfo(tokenRecord, token, startLineNumber, currentOffset(), startLineStartOffset, currentPosition());
- return token;
- }
+ break;
+ }
case CharacterIdentifierStart: {
if constexpr (ASSERT_ENABLED) {
UChar32 codePoint;
@@ -2511,6 +2506,7 @@
shiftLineTerminator();
m_atLineStart = true;
m_hasLineTerminatorBeforeToken = true;
+ m_lineStart = m_code;
goto start;
case CharacterHash: {
// Hashbang is only permitted at the start of the source text.
@@ -2571,6 +2567,7 @@
shiftLineTerminator();
m_atLineStart = true;
m_hasLineTerminatorBeforeToken = true;
+ m_lineStart = m_code;
if (!lastTokenWasRestrKeyword())
goto start;
@@ -2702,9 +2699,6 @@
ASSERT(!m_error);
ASSERT(m_buffer16.isEmpty());
- int startingLineStartOffset = currentLineStartOffset();
- int startingLineNumber = lineNumber();
-
// Leading backquote ` (for template head) or closing brace } (for template trailing) are already shifted in the previous token scan.
// So in this re-scan phase, shift() is not needed here.
StringParseResult result = parseTemplateLiteral(tokenData, rawStringsBuildMode);
@@ -2717,7 +2711,7 @@
// Since TemplateString always ends with ` or }, m_atLineStart always becomes false.
m_atLineStart = false;
- fillTokenInfo(tokenRecord, token, startingLineNumber, currentOffset(), startingLineStartOffset, currentPosition());
+ fillTokenInfo(tokenRecord, token, m_lineNumber, currentOffset(), currentLineStartOffset(), currentPosition());
return token;
}
