diff --git a/llvm/lib/MC/MCParser/MasmParser.cpp b/llvm/lib/MC/MCParser/MasmParser.cpp --- a/llvm/lib/MC/MCParser/MasmParser.cpp +++ b/llvm/lib/MC/MCParser/MasmParser.cpp @@ -6035,9 +6035,10 @@ if (parseIdentifier(TypeName)) return Error(TypeLoc, "expected type"); AsmTypeInfo Type; - if (lookUpType(TypeName, Type)) + if (!lookUpType(TypeName, Type)) + KnownType[Name.lower()] = Type; + else if (!TypeName.equals_insensitive("proc")) return Error(TypeLoc, "unrecognized type"); - KnownType[Name.lower()] = Type; MCSymbol *Sym = getContext().getOrCreateSymbol(Name); Sym->setExternal(true); diff --git a/llvm/test/tools/llvm-ml/extern.asm b/llvm/test/tools/llvm-ml/extern.asm --- a/llvm/test/tools/llvm-ml/extern.asm +++ b/llvm/test/tools/llvm-ml/extern.asm @@ -1,9 +1,10 @@ ; RUN: llvm-ml -m32 -filetype=s %s /Fo - | FileCheck %s --check-prefixes=CHECK,CHECK-32 ; RUN: llvm-ml -m64 -filetype=s %s /Fo - | FileCheck %s --check-prefixes=CHECK,CHECK-64 -extern foo : dword, bar : word +extern foo : dword, bar : word, baz : proc ; CHECK: .extern foo ; CHECK: .extern bar +; CHECK: .extern baz .code mov ebx, foo diff --git a/llvm/test/tools/llvm-ml/indirect_branch.asm b/llvm/test/tools/llvm-ml/indirect_branch.asm --- a/llvm/test/tools/llvm-ml/indirect_branch.asm +++ b/llvm/test/tools/llvm-ml/indirect_branch.asm @@ -6,6 +6,8 @@ else extern fn_ref_extern : dword endif + +extern fn_proc_extern : proc extern fn_ref_extern_word : word .data @@ -248,3 +250,33 @@ ; CHECK-32: call word ptr [fn_ref_extern_word] ; CHECK-32-NEXT: jmp word ptr [fn_ref_extern_word] endif + +t23: +call fn_proc_extern +jmp fn_proc_extern +; CHECK-LABEL: t23: +; CHECK: call fn_proc_extern + +t24: +call [fn_proc_extern] +jmp [fn_proc_extern] +; CHECK-LABEL: t24: +; CHECK: call fn_proc_extern + +ifdef rax + t25: + call qword ptr [fn_ref_extern] + jmp qword ptr [fn_ref_extern] + ; CHECK-64-LABEL: t25: + ; CHECK-64: call qword ptr [rip + fn_ref_extern] + ; CHECK-64: jmp qword ptr [rip + fn_ref_extern] +else + t25: + call dword ptr [fn_ref_extern] + jmp dword ptr [fn_ref_extern] + ; CHECK-32-LABEL: t25: + ; CHECK-32: call dword ptr [fn_ref_extern] + ; CHECK-32: jmp dword ptr [fn_ref_extern] +endif + +end