Title: [254917] releases/WebKitGTK/webkit-2.26/Source/_javascript_Core
- Revision
- 254917
- Author
- [email protected]
- Date
- 2020-01-22 06:08:35 -0800 (Wed, 22 Jan 2020)
Log Message
Merged r254637 - Offlineasm warnings with newer Ruby versions
https://bugs.webkit.org/show_bug.cgi?id=206233
Reviewed by Yusuke Suzuki.
Avoid a warning about using Object#=~ on Annotation instances, which
has been deprecated in Ruby 2.7.
* offlineasm/parser.rb: Swap checks to prevent applying the =~ operator
to Annotation instances, which do not define it.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.26/Source/_javascript_Core/ChangeLog (254916 => 254917)
--- releases/WebKitGTK/webkit-2.26/Source/_javascript_Core/ChangeLog 2020-01-22 13:15:20 UTC (rev 254916)
+++ releases/WebKitGTK/webkit-2.26/Source/_javascript_Core/ChangeLog 2020-01-22 14:08:35 UTC (rev 254917)
@@ -1,3 +1,16 @@
+2020-01-15 Adrian Perez de Castro <[email protected]>
+
+ Offlineasm warnings with newer Ruby versions
+ https://bugs.webkit.org/show_bug.cgi?id=206233
+
+ Reviewed by Yusuke Suzuki.
+
+ Avoid a warning about using Object#=~ on Annotation instances, which
+ has been deprecated in Ruby 2.7.
+
+ * offlineasm/parser.rb: Swap checks to prevent applying the =~ operator
+ to Annotation instances, which do not define it.
+
2019-10-01 Saam Barati <[email protected]>
ObjectAllocationSinkingPhase shouldn't insert hints for allocations which are no longer valid
Modified: releases/WebKitGTK/webkit-2.26/Source/_javascript_Core/offlineasm/parser.rb (254916 => 254917)
--- releases/WebKitGTK/webkit-2.26/Source/_javascript_Core/offlineasm/parser.rb 2020-01-22 13:15:20 UTC (rev 254916)
+++ releases/WebKitGTK/webkit-2.26/Source/_javascript_Core/offlineasm/parser.rb 2020-01-22 14:08:35 UTC (rev 254917)
@@ -628,9 +628,7 @@
firstCodeOrigin = @tokens[@idx].codeOrigin
list = []
loop {
- if (@idx == @tokens.length and not final) or (final and @tokens[@idx] =~ final)
- break
- elsif @tokens[@idx].is_a? Annotation
+ if @tokens[@idx].is_a? Annotation
# This is the only place where we can encounter a global
# annotation, and hence need to be able to distinguish between
# them.
@@ -644,6 +642,8 @@
list << Instruction.new(codeOrigin, annotationOpcode, [], @tokens[@idx].string)
@annotation = nil
@idx += 2 # Consume the newline as well.
+ elsif (@idx == @tokens.length and not final) or (final and @tokens[@idx] =~ final)
+ break
elsif @tokens[@idx] == "\n"
# ignore
@idx += 1
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
