diff options
| -rw-r--r-- | llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp | 11 | ||||
| -rw-r--r-- | llvm/test/CodeGen/PowerPC/empty-functions.ll | 2 | ||||
| -rw-r--r-- | llvm/test/CodeGen/PowerPC/ppc64-linux-func-size.ll | 2 | ||||
| -rw-r--r-- | llvm/test/CodeGen/SPARC/empty-functions.ll | 2 | ||||
| -rw-r--r-- | llvm/test/CodeGen/X86/empty-functions.ll | 2 | ||||
| -rw-r--r-- | llvm/test/CodeGen/X86/statepoint-call-lowering.ll | 2 | ||||
| -rw-r--r-- | llvm/test/DebugInfo/X86/debug-loc-asan.ll | 2 | ||||
| -rw-r--r-- | llvm/test/DebugInfo/X86/pr19307.ll | 2 |
8 files changed, 11 insertions, 14 deletions
diff --git a/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp b/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp index da66bc91ec0..3721458d699 100644 --- a/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp +++ b/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp @@ -882,7 +882,7 @@ void AsmPrinter::EmitFunctionBody() { // Emit target-specific gunk after the function body. EmitFunctionBodyEnd(); - if (!MMI->getLandingPads().empty()) { + if (!MMI->getLandingPads().empty() || MAI->hasDotTypeDotSizeDirective()) { // Create a symbol for the end of function. CurrentFnEnd = createTempSymbol("func_end", getFunctionNumber()); OutStreamer.EmitLabel(CurrentFnEnd); @@ -891,13 +891,10 @@ void AsmPrinter::EmitFunctionBody() { // If the target wants a .size directive for the size of the function, emit // it. if (MAI->hasDotTypeDotSizeDirective()) { - // Create a symbol for the end of function, so we can get the size as - // difference between the function label and the temp label. - MCSymbol *FnEndLabel = OutContext.CreateTempSymbol(); - OutStreamer.EmitLabel(FnEndLabel); - + // We can get the size as difference between the function label and the + // temp label. const MCExpr *SizeExp = - MCBinaryExpr::CreateSub(MCSymbolRefExpr::Create(FnEndLabel, OutContext), + MCBinaryExpr::CreateSub(MCSymbolRefExpr::Create(CurrentFnEnd, OutContext), MCSymbolRefExpr::Create(CurrentFnSymForSize, OutContext), OutContext); diff --git a/llvm/test/CodeGen/PowerPC/empty-functions.ll b/llvm/test/CodeGen/PowerPC/empty-functions.ll index e32a8472b83..41fe5094daf 100644 --- a/llvm/test/CodeGen/PowerPC/empty-functions.ll +++ b/llvm/test/CodeGen/PowerPC/empty-functions.ll @@ -39,5 +39,5 @@ entry: ; LINUX-FP-NEXT:{{^}}.L{{.*}}:{{$}} ; LINUX-FP-NEXT: .cfi_def_cfa_register r31 ; LINUX-FP-NEXT:{{^}}.L{{.*}}:{{$}} -; LINUX-FP-NEXT: .size func, .Ltmp3-func +; LINUX-FP-NEXT: .size func, .Lfunc_end0-func ; LINUX-FP-NEXT: .cfi_endproc diff --git a/llvm/test/CodeGen/PowerPC/ppc64-linux-func-size.ll b/llvm/test/CodeGen/PowerPC/ppc64-linux-func-size.ll index e1d50bac51a..21d5bddeb4c 100644 --- a/llvm/test/CodeGen/PowerPC/ppc64-linux-func-size.ll +++ b/llvm/test/CodeGen/PowerPC/ppc64-linux-func-size.ll @@ -19,4 +19,4 @@ entry: ; however, using this directive with recent binutils will result in the error: ; .size expression for XXX does not evaluate to a constant ; so we must use the label which actually tags the start of the function. -; CHECK: .size test1, .Ltmp0-.L.test1 +; CHECK: .size test1, .Lfunc_end0-.L.test1 diff --git a/llvm/test/CodeGen/SPARC/empty-functions.ll b/llvm/test/CodeGen/SPARC/empty-functions.ll index 38d288903d4..1f8c5e3a312 100644 --- a/llvm/test/CodeGen/SPARC/empty-functions.ll +++ b/llvm/test/CodeGen/SPARC/empty-functions.ll @@ -28,5 +28,5 @@ entry: ; LINUX-FP-NEXT: {{^}}.L{{.*}}:{{$}} ; LINUX-FP-NEXT: .cfi_register 15, 31 ; LINUX-FP-NEXT: {{^}}.L{{.*}}:{{$}} -; LINUX-FP-NEXT: .size func, .Ltmp3-func +; LINUX-FP-NEXT: .size func, .Lfunc_end0-func ; LINUX-FP-NEXT: .cfi_endproc diff --git a/llvm/test/CodeGen/X86/empty-functions.ll b/llvm/test/CodeGen/X86/empty-functions.ll index 42349688a71..735df2a4196 100644 --- a/llvm/test/CodeGen/X86/empty-functions.ll +++ b/llvm/test/CodeGen/X86/empty-functions.ll @@ -50,5 +50,5 @@ entry: ; LINUX-FP-NEXT:{{^}}.L{{.*}}:{{$}} ; LINUX-FP-NEXT: .cfi_def_cfa_register %rbp ; LINUX-FP-NEXT:{{^}}.L{{.*}}:{{$}} -; LINUX-FP-NEXT: .size func, .Ltmp3-func +; LINUX-FP-NEXT: .size func, .Lfunc_end0-func ; LINUX-FP-NEXT: .cfi_endproc diff --git a/llvm/test/CodeGen/X86/statepoint-call-lowering.ll b/llvm/test/CodeGen/X86/statepoint-call-lowering.ll index e1a1369534f..22049cfa385 100644 --- a/llvm/test/CodeGen/X86/statepoint-call-lowering.ll +++ b/llvm/test/CodeGen/X86/statepoint-call-lowering.ll @@ -66,7 +66,7 @@ define i1 @test_relocate(i32 addrspace(1)* %a) gc "statepoint-example" { ; Check that an ununsed relocate has no code-generation impact ; CHECK: pushq %rax ; CHECK: callq return_i1 -; CHECK-NEXT: .Ltmp13: +; CHECK-NEXT: .Ltmp9: ; CHECK-NEXT: popq %rdx ; CHECK-NEXT: retq entry: diff --git a/llvm/test/DebugInfo/X86/debug-loc-asan.ll b/llvm/test/DebugInfo/X86/debug-loc-asan.ll index b15668a7547..4a087f342f3 100644 --- a/llvm/test/DebugInfo/X86/debug-loc-asan.ll +++ b/llvm/test/DebugInfo/X86/debug-loc-asan.ll @@ -28,7 +28,7 @@ ; Then it's addressed via %rsp: ; CHECK: .quad [[START_LABEL]]-.Lfunc_begin0 -; CHECK-NEXT: .Lfunc_end0-.Lfunc_begin0 +; CHECK-NEXT: .Lfunc_end06-.Lfunc_begin0 ; CHECK: DW_OP_breg7 ; CHECK-NEXT: [[OFFSET]] ; CHECK: DW_OP_deref diff --git a/llvm/test/DebugInfo/X86/pr19307.ll b/llvm/test/DebugInfo/X86/pr19307.ll index e673f1d7cf3..13023ac8b8f 100644 --- a/llvm/test/DebugInfo/X86/pr19307.ll +++ b/llvm/test/DebugInfo/X86/pr19307.ll @@ -21,7 +21,7 @@ ; CHECK: .Ldebug_loc{{[0-9]+}}: ; CHECK: DW_OP_breg1 ; CHECK: .quad [[START_LABEL]]-.Lfunc_begin0 -; CHECK-NEXT: .quad .Lfunc_end0-.Lfunc_begin0 +; CHECK-NEXT: .quad .Lfunc_end09-.Lfunc_begin0 ; CHECK: DW_OP_breg6 ; CHECK: DW_OP_deref |
