diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-04-12 12:58:29 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@digia.com> | 2013-04-12 17:30:06 +0200 |
| commit | fd09b7d9b54ccb4d737747ee7fba26f15f4901cd (patch) | |
| tree | cb8b68211b0eff5c2b4927182c93749b053edb71 /src/3rdparty/masm/assembler/MacroAssemblerCodeRef.h | |
| parent | 89be8e111c34bf6e96710e574c251587dd59f42b (diff) | |
WTF/JSC update to r148273
This brings in various bug fixes in the ARM and MIPS assemblers as well as
a Yarr crash fix and performance fix.
This change doesn't compile as-is, but the next change will
apply the modifications necessary to compile. That'll make future updates
easier as it allows for cherry-picking because the modifications are usually
always the same.
Change-Id: Iac32f62c71e8ff908deb41f28f12fbc98c0823e1
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/3rdparty/masm/assembler/MacroAssemblerCodeRef.h')
| -rw-r--r-- | src/3rdparty/masm/assembler/MacroAssemblerCodeRef.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/3rdparty/masm/assembler/MacroAssemblerCodeRef.h b/src/3rdparty/masm/assembler/MacroAssemblerCodeRef.h index 89cffb1278..c2af24060a 100644 --- a/src/3rdparty/masm/assembler/MacroAssemblerCodeRef.h +++ b/src/3rdparty/masm/assembler/MacroAssemblerCodeRef.h @@ -134,13 +134,6 @@ public: ASSERT_VALID_CODE_POINTER(m_value); } - template<typename returnType, typename argType1, typename argType2, typename argType3, typename argType4, typename argType5, typename argType6> - FunctionPtr(returnType(*value)(argType1, argType2, argType3, argType4, argType5, argType6)) - : m_value((void*)value) - { - ASSERT_VALID_CODE_POINTER(m_value); - } - // MSVC doesn't seem to treat functions with different calling conventions as // different types; these methods already defined for fastcall, below. #if CALLING_CONVENTION_IS_STDCALL && !OS(WINDOWS) |