diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-01-10 14:14:14 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-01-28 19:04:29 +0000 |
| commit | 39bdb9d6f30151ee24614df1dbcd2d44ec342e59 (patch) | |
| tree | 28f8966e694833576d679d65555cefbc13c25d15 /src/3rdparty/masm/yarr | |
| parent | d5579e7094c70db66a193ae1daffd4c71e8fc10b (diff) | |
Changed JSC::MacroAssembler to be a template
Change-Id: If6edb7ed0fac51e93b218eb45c01274a87b9e904
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/3rdparty/masm/yarr')
| -rw-r--r-- | src/3rdparty/masm/yarr/YarrJIT.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/3rdparty/masm/yarr/YarrJIT.cpp b/src/3rdparty/masm/yarr/YarrJIT.cpp index c6f2cdb91f..e4f2d97759 100644 --- a/src/3rdparty/masm/yarr/YarrJIT.cpp +++ b/src/3rdparty/masm/yarr/YarrJIT.cpp @@ -39,7 +39,7 @@ using namespace WTF; namespace JSC { namespace Yarr { template<YarrJITCompileMode compileMode> -class YarrGenerator : private MacroAssembler { +class YarrGenerator : private DefaultMacroAssembler { friend void jitCompile(JSGlobalData*, YarrCodeBlock& jitObject, const String& pattern, unsigned& numSubpatterns, const char*& error, bool ignoreCase, bool multiline); #if CPU(ARM) @@ -599,7 +599,7 @@ class YarrGenerator : private MacroAssembler { } // Called at the end of code generation to link all return addresses. - void linkDataLabels(LinkBuffer<JSC::MacroAssembler>& linkBuffer) + void linkDataLabels(LinkBuffer<JSC::DefaultMacroAssembler>& linkBuffer) { ASSERT(isEmpty()); for (unsigned i = 0; i < m_backtrackRecords.size(); ++i) @@ -2676,7 +2676,7 @@ public: backtrack(); // Link & finalize the code. - LinkBuffer<JSC::MacroAssembler> linkBuffer(*globalData, this, REGEXP_CODE_ID); + LinkBuffer<JSC::DefaultMacroAssembler> linkBuffer(*globalData, this, REGEXP_CODE_ID); m_backtrackingState.linkDataLabels(linkBuffer); if (compileMode == MatchOnly) { |