llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-backend-x86 Author: None (llvmbot) <details> <summary>Changes</summary> Backport 7574e1ddc4be63628cb7617857cc8938058a79d2 Requested by: @<!-- -->mstorsjo --- Full diff: https://github.com/llvm/llvm-project/pull/109091.diff 2 Files Affected: - (modified) llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp (+2-1) - (modified) llvm/test/tools/llvm-ml/rip_relative_addressing.asm (+11-1) ``````````diff diff --git a/llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp b/llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp index c7f88fed9b128b..efbcb57add98c9 100644 --- a/llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp +++ b/llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp @@ -2707,7 +2707,8 @@ bool X86AsmParser::parseIntelOperand(OperandVector &Operands, StringRef Name) { bool MaybeDirectBranchDest = true; if (Parser.isParsingMasm()) { - if (is64BitMode() && SM.getElementSize() > 0) { + if (is64BitMode() && + ((PtrInOperand && !IndexReg) || SM.getElementSize() > 0)) { DefaultBaseReg = X86::RIP; } if (IsUnconditionalBranch) { diff --git a/llvm/test/tools/llvm-ml/rip_relative_addressing.asm b/llvm/test/tools/llvm-ml/rip_relative_addressing.asm index d237e84435b7d6..c005b9721c07e0 100644 --- a/llvm/test/tools/llvm-ml/rip_relative_addressing.asm +++ b/llvm/test/tools/llvm-ml/rip_relative_addressing.asm @@ -53,4 +53,14 @@ mov eax, [t8] ; CHECK-LABEL: t8: ; CHECK: mov eax, dword ptr [t8] -END \ No newline at end of file +t9: +mov eax, dword ptr [bar] +; CHECK-LABEL: t9: +; CHECK-32: mov eax, dword ptr [bar] +; CHECK-64: mov eax, dword ptr [rip + bar] + +t10: +mov ebx, dword ptr [4*eax] +; CHECK: mov ebx, dword ptr [4*eax] + +END `````````` </details> https://github.com/llvm/llvm-project/pull/109091 _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
