From c82398a2ace7399508d4540677745acc2119af46 Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Wed, 4 Mar 2015 00:27:43 +0000 Subject: [PATCH] Drop the "eh_" from eh_func_begin and eh_func_end. They will be used for more than eh tables. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@231185 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/AsmPrinter/AsmPrinter.cpp | 4 ++-- test/CodeGen/Mips/mips16ex.ll | 2 +- test/CodeGen/X86/eh-label.ll | 8 ++++---- test/CodeGen/X86/global-sections.ll | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/CodeGen/AsmPrinter/AsmPrinter.cpp b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp index 1cb14f0833d..da66bc91ec0 100644 --- a/lib/CodeGen/AsmPrinter/AsmPrinter.cpp +++ b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp @@ -557,7 +557,7 @@ void AsmPrinter::EmitFunctionHeader() { } if (!MMI->getLandingPads().empty()) { - CurrentFnBegin = createTempSymbol("eh_func_begin", getFunctionNumber()); + CurrentFnBegin = createTempSymbol("func_begin", getFunctionNumber()); if (MAI->useAssignmentForEHBegin()) { MCSymbol *CurPos = OutContext.CreateTempSymbol(); @@ -884,7 +884,7 @@ void AsmPrinter::EmitFunctionBody() { if (!MMI->getLandingPads().empty()) { // Create a symbol for the end of function. - CurrentFnEnd = createTempSymbol("eh_func_end", getFunctionNumber()); + CurrentFnEnd = createTempSymbol("func_end", getFunctionNumber()); OutStreamer.EmitLabel(CurrentFnEnd); } diff --git a/test/CodeGen/Mips/mips16ex.ll b/test/CodeGen/Mips/mips16ex.ll index 983d4dac94e..4090c7b884e 100644 --- a/test/CodeGen/Mips/mips16ex.ll +++ b/test/CodeGen/Mips/mips16ex.ll @@ -2,7 +2,7 @@ ;16: main: ;16-NEXT: [[TMP:.*]]: -;16-NEXT: $eh_func_begin0 = ([[TMP]]) +;16-NEXT: $func_begin0 = ([[TMP]]) ;16-NEXT: .cfi_startproc ;16-NEXT: .cfi_personality @.str = private unnamed_addr constant [7 x i8] c"hello\0A\00", align 1 diff --git a/test/CodeGen/X86/eh-label.ll b/test/CodeGen/X86/eh-label.ll index 7019b45877a..aff0bcfffcf 100644 --- a/test/CodeGen/X86/eh-label.ll +++ b/test/CodeGen/X86/eh-label.ll @@ -1,13 +1,13 @@ ; RUN: llc < %s -mtriple=x86_64-pc-linux | FileCheck %s -; Test that we don't crashe if the .Leh_func_end0 name is taken. +; Test that we don't crashe if the .Lfunc_end0 name is taken. declare void @g() define void @f() { bb0: - call void asm ".Leh_func_end0:", ""() + call void asm ".Lfunc_end0:", ""() ; CHECK: #APP -; CHECK-NEXT: .Leh_func_end0: +; CHECK-NEXT: .Lfunc_end0: ; CHECK-NEXT: #NO_APP invoke void @g() to label %bb2 unwind label %bb1 @@ -19,6 +19,6 @@ bb1: bb2: ret void -; CHECK: [[END:.Leh_func_end.*]]: +; CHECK: [[END:.Lfunc_end.*]]: ; CHECK: .long [[END]]- } diff --git a/test/CodeGen/X86/global-sections.ll b/test/CodeGen/X86/global-sections.ll index 6369539df2d..54c4b1a6f53 100644 --- a/test/CodeGen/X86/global-sections.ll +++ b/test/CodeGen/X86/global-sections.ll @@ -84,7 +84,7 @@ bb7: } ; DARWIN64: _F3: -; DARWIN64: Leh_func_end +; DARWIN64: Lfunc_end ; DARWIN64-NEXT: .cfi_endproc ; DARWIN64-NEXT: .section __TEXT,__gcc_except_tab ; DARWIN64-NOT: .section