[llvm] Emit some extra labels in the mono EH writer which are needed by ARMAsmPrinter on 32 bit ios.

Author: vargaz

lib/CodeGen/AsmPrinter/AsmPrinter.cpp

@@ -364,7 +364,7 @@ bool AsmPrinter::doInitialization(Module &M) {
     Handlers.push_back(HandlerInfo(ES, EHTimerName, EHTimerDescription,
                                    DWARFGroupName, DWARFGroupDescription));
   if (EnableMonoEH)
-    Handlers.push_back(HandlerInfo(new MonoException(this), EHTimerName, EHTimerDescription, DWARFGroupName, DWARFGroupDescription));
+    Handlers.push_back(HandlerInfo(new MonoException(this, DisableGNUEH), EHTimerName, EHTimerDescription, DWARFGroupName, DWARFGroupDescription));
   return false;
 }
 

lib/CodeGen/AsmPrinter/MonoException.cpp

@@ -240,10 +240,11 @@ emitCFIInstructions(MCStreamer &streamer,
   }
 }
 
-MonoException::MonoException(AsmPrinter *A)
+MonoException::MonoException(AsmPrinter *A, bool disableGNUEH)
   : EHStreamer(A)
 {
   RI = nullptr;
+  DisableGNUEH = disableGNUEH;
 }
 
 MonoException::~MonoException()
@@ -404,6 +405,10 @@ MonoException::endFunction(const MachineFunction *MF)
   info.Instructions = MF->getFrameInstructions();
   assert (info.Instructions.size () == info.EHLabels.size());
 
+  if (DisableGNUEH)
+    /* ARMAsmPrinter generates references to this */
+    Asm->OutStreamer->EmitLabel(Asm->getCurExceptionSym());
+
   PrepareMonoLSDA(&info);
 
   Frames.push_back(info);

lib/CodeGen/AsmPrinter/MonoException.h

@@ -19,7 +19,7 @@ class TargetRegisterInfo;
 
 class MonoException : public EHStreamer {
 public:
-  MonoException(AsmPrinter *A);
+    MonoException(AsmPrinter *A, bool disableGNUEH);
   virtual ~MonoException();
 
   virtual void endModule();
@@ -72,6 +72,7 @@ class MonoException : public EHStreamer {
   std::vector<EHInfo> Frames;
   StringMap<int> FuncIndexes;
   const TargetRegisterInfo *RI;
+  bool DisableGNUEH;
 };
 } // End of namespace llvm