Merge pull request #15 from mono/android-eh

vargaz · web-flow · commit 117a508c0ca6 · 2018-09-15T15:54:12.000+02:00
Emit .fnstart/.fnend directives on arm ELF platforms in the mono EH w…
diff --git a/lib/CodeGen/AsmPrinter/MonoException.cpp b/lib/CodeGen/AsmPrinter/MonoException.cpp
@@ -254,6 +254,8 @@ MonoException::~MonoException()
 void
 MonoException::beginFunction(const MachineFunction *MF)
 {
+  if (DisableGNUEH && Asm->MAI->getExceptionHandlingType() == ExceptionHandling::ARM)
+    static_cast<ARMTargetStreamer*>(Asm->OutStreamer->getTargetStreamer())->emitFnStart();
   EHLabels.clear();
 }
 
@@ -414,6 +416,8 @@ MonoException::endFunction(const MachineFunction *MF)
   Frames.push_back(info);
   EHLabels.clear();
 
+  if (DisableGNUEH && Asm->MAI->getExceptionHandlingType() == ExceptionHandling::ARM)
+    static_cast<ARMTargetStreamer*>(Asm->OutStreamer->getTargetStreamer())->emitFnEnd();
 }
 
 /// EmitMonoLSDA - Mono's version of EmitExceptionTable

Original file line number	Diff line number	Diff line change
`@@ -254,6 +254,8 @@ MonoException::~MonoException()`
`254`	`254`	`void`
`255`	`255`	`MonoException::beginFunction(const MachineFunction *MF)`
`256`	`256`	`{`
	`257`	`+ if (DisableGNUEH && Asm->MAI->getExceptionHandlingType() == ExceptionHandling::ARM)`
	`258`	`+ static_cast<ARMTargetStreamer*>(Asm->OutStreamer->getTargetStreamer())->emitFnStart();`
`257`	`259`	`EHLabels.clear();`
`258`	`260`	`}`
`259`	`261`
`@@ -414,6 +416,8 @@ MonoException::endFunction(const MachineFunction *MF)`
`414`	`416`	`Frames.push_back(info);`
`415`	`417`	`EHLabels.clear();`
`416`	`418`
	`419`	`+ if (DisableGNUEH && Asm->MAI->getExceptionHandlingType() == ExceptionHandling::ARM)`
	`420`	`+ static_cast<ARMTargetStreamer*>(Asm->OutStreamer->getTargetStreamer())->emitFnEnd();`
`417`	`421`	`}`
`418`	`422`
`419`	`423`	`/// EmitMonoLSDA - Mono's version of EmitExceptionTable`