diff options
| -rw-r--r-- | llvm/lib/Target/WebAssembly/WebAssemblyRegStackify.cpp | 18 | ||||
| -rw-r--r-- | llvm/test/CodeGen/WebAssembly/reg-stackify.ll | 2 |
2 files changed, 6 insertions, 14 deletions
diff --git a/llvm/lib/Target/WebAssembly/WebAssemblyRegStackify.cpp b/llvm/lib/Target/WebAssembly/WebAssemblyRegStackify.cpp index ceb024b4be0..e991bf47e07 100644 --- a/llvm/lib/Target/WebAssembly/WebAssemblyRegStackify.cpp +++ b/llvm/lib/Target/WebAssembly/WebAssemblyRegStackify.cpp @@ -181,19 +181,6 @@ static void Query(const MachineInstr &MI, AliasAnalysis &AA, bool &Read, // Check for stores. if (MI.mayStore()) { Write = true; - - // Check for stores to __stack_pointer. - for (auto MMO : MI.memoperands()) { - const MachinePointerInfo &MPI = MMO->getPointerInfo(); - if (MPI.V.is<const PseudoSourceValue *>()) { - auto PSV = MPI.V.get<const PseudoSourceValue *>(); - if (const ExternalSymbolPseudoSourceValue *EPSV = - dyn_cast<ExternalSymbolPseudoSourceValue>(PSV)) - if (StringRef(EPSV->getSymbol()) == "__stack_pointer") { - StackPointer = true; - } - } - } } else if (MI.hasOrderedMemoryRef()) { switch (MI.getOpcode()) { case WebAssembly::DIV_S_I32: @@ -258,6 +245,11 @@ static void Query(const MachineInstr &MI, AliasAnalysis &AA, bool &Read, } } + // Check for writes to __stack_pointer global. + if (MI.getOpcode() == WebAssembly::GLOBAL_SET_I32 && + strcmp(MI.getOperand(0).getSymbolName(), "__stack_pointer") == 0) + StackPointer = true; + // Analyze calls. if (MI.isCall()) { unsigned CalleeOpNo = WebAssembly::getCalleeOpNo(MI); diff --git a/llvm/test/CodeGen/WebAssembly/reg-stackify.ll b/llvm/test/CodeGen/WebAssembly/reg-stackify.ll index 2b36ba0e3ef..6b4487bc66f 100644 --- a/llvm/test/CodeGen/WebAssembly/reg-stackify.ll +++ b/llvm/test/CodeGen/WebAssembly/reg-stackify.ll @@ -634,7 +634,7 @@ bb10: ; preds = %bb9, %bb ; NOREGS-LABEL: stackpointer_dependency: ; NOREGS: call stackpointer_callee@FUNCTION ; NOREGS: global.set __stack_pointer -declare i32 @stackpointer_callee(i8* readnone, i8* readnone) +declare i32 @stackpointer_callee(i8* readnone, i8* readnone) nounwind readnone declare i8* @llvm.frameaddress(i32) define i32 @stackpointer_dependency(i8* readnone) { %2 = tail call i8* @llvm.frameaddress(i32 0) |
