View | Details | Raw Unified | Return to bug 280728
Collapse All | Expand All

(-)b/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_assembler_AbstractMacroAssembler.h (+11 lines)
Added Link Here
1
--- Source/JavaScriptCore/assembler/AbstractMacroAssembler.h.orig	2021-10-21 08:52:07 UTC
2
+++ Source/JavaScriptCore/assembler/AbstractMacroAssembler.h
3
@@ -971,7 +971,7 @@ class AbstractMacroAssembler : public AbstractMacroAss
4
     template<PtrTag tag>
5
     static void repatchCompact(CodeLocationDataLabelCompact<tag> dataLabelCompact, int32_t value)
6
     {
7
-        AssemblerType::repatchCompact(dataLabelCompact.template dataLocation(), value);
8
+        AssemblerType::repatchCompact(dataLabelCompact.template dataLocation<>(), value);
9
     }
10
 
11
     template<PtrTag tag>
(-)b/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_llint_LLIntData.h (+56 lines)
Added Link Here
1
--- Source/JavaScriptCore/llint/LLIntData.h.orig	2021-10-21 08:52:07 UTC
2
+++ Source/JavaScriptCore/llint/LLIntData.h
3
@@ -217,7 +217,7 @@ ALWAYS_INLINE LLIntCode getCodeFunctionPtr(OpcodeID op
4
 #if COMPILER(MSVC)
5
     return reinterpret_cast<LLIntCode>(getCodePtr<tag>(opcodeID).executableAddress());
6
 #else
7
-    return reinterpret_cast<LLIntCode>(getCodePtr<tag>(opcodeID).template executableAddress());
8
+    return reinterpret_cast<LLIntCode>(getCodePtr<tag>(opcodeID).template executableAddress<>());
9
 #endif
10
 }
11
 
12
@@ -227,7 +227,7 @@ ALWAYS_INLINE LLIntCode getWide16CodeFunctionPtr(Opcod
13
 #if COMPILER(MSVC)
14
     return reinterpret_cast<LLIntCode>(getWide16CodePtr<tag>(opcodeID).executableAddress());
15
 #else
16
-    return reinterpret_cast<LLIntCode>(getWide16CodePtr<tag>(opcodeID).template executableAddress());
17
+    return reinterpret_cast<LLIntCode>(getWide16CodePtr<tag>(opcodeID).template executableAddress<>());
18
 #endif
19
 }
20
 
21
@@ -237,7 +237,7 @@ ALWAYS_INLINE LLIntCode getWide32CodeFunctionPtr(Opcod
22
 #if COMPILER(MSVC)
23
     return reinterpret_cast<LLIntCode>(getWide32CodePtr<tag>(opcodeID).executableAddress());
24
 #else
25
-    return reinterpret_cast<LLIntCode>(getWide32CodePtr<tag>(opcodeID).template executableAddress());
26
+    return reinterpret_cast<LLIntCode>(getWide32CodePtr<tag>(opcodeID).template executableAddress<>());
27
 #endif
28
 }
29
 
30
@@ -328,7 +328,7 @@ ALWAYS_INLINE LLIntCode getCodeFunctionPtr(WasmOpcodeI
31
 #if COMPILER(MSVC)
32
     return reinterpret_cast<LLIntCode>(getCodePtr<tag>(opcodeID).executableAddress());
33
 #else
34
-    return reinterpret_cast<LLIntCode>(getCodePtr<tag>(opcodeID).template executableAddress());
35
+    return reinterpret_cast<LLIntCode>(getCodePtr<tag>(opcodeID).template executableAddress<>());
36
 #endif
37
 }
38
 
39
@@ -338,7 +338,7 @@ ALWAYS_INLINE LLIntCode getWide16CodeFunctionPtr(WasmO
40
 #if COMPILER(MSVC)
41
     return reinterpret_cast<LLIntCode>(getWide16CodePtr<tag>(opcodeID).executableAddress());
42
 #else
43
-    return reinterpret_cast<LLIntCode>(getWide16CodePtr<tag>(opcodeID).template executableAddress());
44
+    return reinterpret_cast<LLIntCode>(getWide16CodePtr<tag>(opcodeID).template executableAddress<>());
45
 #endif
46
 }
47
 
48
@@ -348,7 +348,7 @@ ALWAYS_INLINE LLIntCode getWide32CodeFunctionPtr(WasmO
49
 #if COMPILER(MSVC)
50
     return reinterpret_cast<LLIntCode>(getWide32CodePtr<tag>(opcodeID).executableAddress());
51
 #else
52
-    return reinterpret_cast<LLIntCode>(getWide32CodePtr<tag>(opcodeID).template executableAddress());
53
+    return reinterpret_cast<LLIntCode>(getWide32CodePtr<tag>(opcodeID).template executableAddress<>());
54
 #endif
55
 }
56
 
(-)b/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_runtime_JSCast.h (+20 lines)
Added Link Here
1
--- Source/JavaScriptCore/runtime/JSCast.h.orig	2021-10-21 08:52:07 UTC
2
+++ Source/JavaScriptCore/runtime/JSCast.h
3
@@ -171,7 +171,7 @@ bool inherits(VM& vm, From* from)
4
 bool inherits(VM& vm, From* from)
5
 {
6
     using Dispatcher = InheritsTraits<Target>;
7
-    return Dispatcher::template inherits(vm, from);
8
+    return Dispatcher::template inherits<>(vm, from);
9
 }
10
 
11
 } // namespace JSCastingHelpers
12
@@ -180,7 +180,7 @@ To jsDynamicCast(VM& vm, From* from)
13
 To jsDynamicCast(VM& vm, From* from)
14
 {
15
     using Dispatcher = JSCastingHelpers::InheritsTraits<typename std::remove_cv<typename std::remove_pointer<To>::type>::type>;
16
-    if (LIKELY(Dispatcher::template inherits(vm, from)))
17
+    if (LIKELY(Dispatcher::template inherits<>(vm, from)))
18
         return static_cast<To>(from);
19
     return nullptr;
20
 }

Return to bug 280728