From: Matt Arsenault Date: Thu, 13 Nov 2014 20:07:40 +0000 (+0000) Subject: R600: Fix assert on empty function X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6ef66144f3e9512d11caeb46425c12a1e0d817f8;p=platform%2Fupstream%2Fllvm.git R600: Fix assert on empty function If a function is just an unreachable, this would hit a "this is not a MachO target" assertion because of setting HasSubsectionViaSymbols. llvm-svn: 221920 --- diff --git a/llvm/lib/Target/R600/MCTargetDesc/AMDGPUMCAsmInfo.cpp b/llvm/lib/Target/R600/MCTargetDesc/AMDGPUMCAsmInfo.cpp index 5393504..3c2b889 100644 --- a/llvm/lib/Target/R600/MCTargetDesc/AMDGPUMCAsmInfo.cpp +++ b/llvm/lib/Target/R600/MCTargetDesc/AMDGPUMCAsmInfo.cpp @@ -14,7 +14,6 @@ using namespace llvm; AMDGPUMCAsmInfo::AMDGPUMCAsmInfo(StringRef &TT) : MCAsmInfoELF() { HasSingleParameterDotFile = false; //===------------------------------------------------------------------===// - HasSubsectionsViaSymbols = true; MaxInstLength = 16; SeparatorString = "\n"; CommentString = ";"; diff --git a/llvm/test/CodeGen/R600/empty-function.ll b/llvm/test/CodeGen/R600/empty-function.ll new file mode 100644 index 0000000..d4ff803 --- /dev/null +++ b/llvm/test/CodeGen/R600/empty-function.ll @@ -0,0 +1,20 @@ +; RUN: llc -march=r600 -mcpu=SI -verify-machineinstrs < %s | FileCheck -check-prefix=SI %s + +; Make sure we don't assert on empty functions + +; SI-LABEL: {{^}}empty_function_ret: +; SI: .text +; SI: s_endpgm +; SI: codeLenInByte = 4 +define void @empty_function_ret() #0 { + ret void +} + +; SI-LABEL: {{^}}empty_function_unreachable: +; SI: .text +; SI: codeLenInByte = 0 +define void @empty_function_unreachable() #0 { + unreachable +} + +attributes #0 = { nounwind }