From 7d3b145da4c1d16e2adb8de73f7c75f09b522d81 Mon Sep 17 00:00:00 2001 From: Peter Collingbourne Date: Thu, 19 Feb 2015 00:45:04 +0000 Subject: [PATCH] llvm-mc: Use Target::createNullStreamer to fix crashes on target-specific asm directives. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@229798 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/CodeGen/ARM/null-streamer.ll | 2 ++ tools/llvm-mc/llvm-mc.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/test/CodeGen/ARM/null-streamer.ll b/test/CodeGen/ARM/null-streamer.ll index 350c45e5beb..19ad22a4bdb 100644 --- a/test/CodeGen/ARM/null-streamer.ll +++ b/test/CodeGen/ARM/null-streamer.ll @@ -5,3 +5,5 @@ define i32 @main() { entry: ret i32 0 } + +module asm ".fnstart" diff --git a/tools/llvm-mc/llvm-mc.cpp b/tools/llvm-mc/llvm-mc.cpp index 78fe9b72f20..91bacc03458 100644 --- a/tools/llvm-mc/llvm-mc.cpp +++ b/tools/llvm-mc/llvm-mc.cpp @@ -465,7 +465,7 @@ int main(int argc, char **argv) { MAB, ShowInst)); } else if (FileType == OFT_Null) { - Str.reset(createNullStreamer(Ctx)); + Str.reset(TheTarget->createNullStreamer(Ctx)); } else { assert(FileType == OFT_ObjectFile && "Invalid file type!"); MCCodeEmitter *CE = TheTarget->createMCCodeEmitter(*MCII, *MRI, *STI, Ctx); -- 2.34.1