XCore: Register null MCTargetStreamer

[arsenm]

Summary

Fixes null dereference when printing globals

[nigelp-xmos]

LGTM

[arsenm]

3bb12d3005ffdf5b2b34d4a84008e50ef4577e46

llvm/lib/Target/XCore/MCTargetDesc/XCoreMCTargetDesc.cpp

 
 static MCTargetStreamer *createTargetAsmStreamer(MCStreamer &S,
                                                  formatted_raw_ostream &OS,
                                                  MCInstPrinter *InstPrint,
                                                  bool isVerboseAsm) {
   return new XCoreTargetAsmStreamer(S, OS);
 }
 
+static MCTargetStreamer *createNullTargetStreamer(MCStreamer &S) {
+  return new XCoreTargetStreamer(S);
+}
+
 // Force static initialization.
 extern "C" LLVM_EXTERNAL_VISIBILITY void LLVMInitializeXCoreTargetMC() {
   // Register the MC asm info.
   RegisterMCAsmInfoFn X(getTheXCoreTarget(), createXCoreMCAsmInfo);
 
   // Register the MC instruction info.
   TargetRegistry::RegisterMCInstrInfo(getTheXCoreTarget(),
                                       createXCoreMCInstrInfo);
 
   // Register the MC register info.
   TargetRegistry::RegisterMCRegInfo(getTheXCoreTarget(),
                                     createXCoreMCRegisterInfo);
 
   // Register the MC subtarget info.
   TargetRegistry::RegisterMCSubtargetInfo(getTheXCoreTarget(),
                                           createXCoreMCSubtargetInfo);
 
   // Register the MCInstPrinter
   TargetRegistry::RegisterMCInstPrinter(getTheXCoreTarget(),
                                         createXCoreMCInstPrinter);
 
   TargetRegistry::RegisterAsmTargetStreamer(getTheXCoreTarget(),
                                             createTargetAsmStreamer);
+
+  TargetRegistry::RegisterNullTargetStreamer(getTheXCoreTarget(),
+                                             createNullTargetStreamer);
 }

llvm/lib/Target/XCore/XCoreTargetStreamer.h

 
 #include "llvm/MC/MCStreamer.h"
 
 namespace llvm {
 class XCoreTargetStreamer : public MCTargetStreamer {
 public:
   XCoreTargetStreamer(MCStreamer &S);
   ~XCoreTargetStreamer() override;
-  virtual void emitCCTopData(StringRef Name) = 0;
-  virtual void emitCCTopFunction(StringRef Name) = 0;
-  virtual void emitCCBottomData(StringRef Name) = 0;
-  virtual void emitCCBottomFunction(StringRef Name) = 0;
+  virtual void emitCCTopData(StringRef Name){};
+  virtual void emitCCTopFunction(StringRef Name){};
+  virtual void emitCCBottomData(StringRef Name){};
+  virtual void emitCCBottomFunction(StringRef Name){};
 };
 }
 
 #endif

llvm/test/CodeGen/XCore/globals.ll

 ; RUN: llc < %s -march=xcore -mcpu=xs1b-generic | FileCheck %s
+; RUN: llc -march=xcore -mcpu=xs1b-generic -filetype=null %s
 
 define i32 *@addr_G1() {
 entry:
 ; CHECK-LABEL: addr_G1:
 ; CHECK: ldaw r0, dp[G1]
   ret i32* @G1
 }