Skip to content
Permalink
Browse files
Speculative build fix: Revert use of .alt_entry directive in LLInt as…
…m code.

https://bugs.webkit.org/show_bug.cgi?id=240916

Unreviewed.

We suspect that this is causing linker issues on some builds.

* Source/JavaScriptCore/llint/LowLevelInterpreter.cpp:

Canonical link: https://commits.webkit.org/250964@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@294810 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
Mark Lam committed May 25, 2022
1 parent 6807660 commit e16c91ff7c9acf15541e9d3d7a6999c1e5223aa5
Showing 1 changed file with 14 additions and 1 deletion.
@@ -478,6 +478,9 @@ JSValue CLoop::execute(OpcodeID entryOpcodeID, void* executableAddress, VM* vm,
// Define the opcode dispatch mechanism when using an ASM loop:
//

// We're disabling this for now because of a suspected linker issue.
#define OFFLINE_ASM_USE_ALT_ENTRY 0

#if COMPILER(CLANG)

// We need an OFFLINE_ASM_BEGIN_SPACER because we'll be declaring every OFFLINE_ASM_GLOBAL_LABEL
@@ -505,9 +508,14 @@ JSValue CLoop::execute(OpcodeID entryOpcodeID, void* executableAddress, VM* vm,
#endif // COMPILER(CLANG)

// These are for building an interpreter from generated assembly code:

#if OFFLINE_ASM_USE_ALT_ENTRY
#define OFFLINE_ASM_BEGIN asm ( \
OFFLINE_ASM_GLOBAL_LABEL_IMPL(jsc_llint_begin, OFFLINE_ASM_NO_ALT_ENTRY_DIRECTIVE) \
OFFLINE_ASM_BEGIN_SPACER
#else
#define OFFLINE_ASM_BEGIN asm (
#endif

#define OFFLINE_ASM_END );

@@ -562,10 +570,15 @@ JSValue CLoop::execute(OpcodeID entryOpcodeID, void* executableAddress, VM* vm,
SYMBOL_STRING(label) ":\n"
#endif

#if OFFLINE_ASM_USE_ALT_ENTRY
#define OFFLINE_ASM_GLOBAL_LABEL(label) \
OFFLINE_ASM_GLOBAL_LABEL_IMPL(label, OFFLINE_ASM_ALT_ENTRY_DIRECTIVE)
#else
#define OFFLINE_ASM_GLOBAL_LABEL(label) \
OFFLINE_ASM_GLOBAL_LABEL_IMPL(label, OFFLINE_ASM_NO_ALT_ENTRY_DIRECTIVE)
#endif // USE_ALT_ENTRY

#if COMPILER(CLANG)
#if COMPILER(CLANG) && OFFLINE_ASM_USE_ALT_ENTRY
#define OFFLINE_ASM_ALT_GLOBAL_LABEL(label) OFFLINE_ASM_GLOBAL_LABEL(label)
#else
#define OFFLINE_ASM_ALT_GLOBAL_LABEL(label)

0 comments on commit e16c91f

Please sign in to comment.