Eliminate arm64 contract asserts (#19015)

noahfalk · Koundinya Veluri · commit d90c382c2daf · 2018-08-27T11:52:51.000-07:00
Port of #19015 to 2.2 These methods don't trigger GC but were previously marked as if they did. Correcting the marking will eliminate spurious asserts.
diff --git a/src/vm/arm64/cgencpu.h b/src/vm/arm64/cgencpu.h
@@ -578,7 +578,7 @@ struct StubPrecode {
         CONTRACTL
         {
             THROWS;
-            GC_TRIGGERS;
+            GC_NOTRIGGER;
         }
         CONTRACTL_END;
 
@@ -591,7 +591,7 @@ struct StubPrecode {
         CONTRACTL
         {
             THROWS;
-            GC_TRIGGERS;
+            GC_NOTRIGGER;
         }
         CONTRACTL_END;
 
@@ -704,7 +704,7 @@ struct FixupPrecode {
         CONTRACTL
         {
             THROWS;
-            GC_TRIGGERS;
+            GC_NOTRIGGER;
         }
         CONTRACTL_END;
 
@@ -717,7 +717,7 @@ struct FixupPrecode {
         CONTRACTL
         {
             THROWS;
-            GC_TRIGGERS;
+            GC_NOTRIGGER;
         }
         CONTRACTL_END;
 
@@ -778,7 +778,7 @@ struct ThisPtrRetBufPrecode {
         CONTRACTL
         {
             THROWS;
-            GC_TRIGGERS;
+            GC_NOTRIGGER;
         }
         CONTRACTL_END;
 

Original file line number	Diff line number	Diff line change
`@@ -578,7 +578,7 @@ struct StubPrecode {`
`578`	`578`	`CONTRACTL`
`579`	`579`	`{`
`580`	`580`	`THROWS;`
`581`		`- GC_TRIGGERS;`
	`581`	`+ GC_NOTRIGGER;`
`582`	`582`	`}`
`583`	`583`	`CONTRACTL_END;`
`584`	`584`
`@@ -591,7 +591,7 @@ struct StubPrecode {`
`591`	`591`	`CONTRACTL`
`592`	`592`	`{`
`593`	`593`	`THROWS;`
`594`		`- GC_TRIGGERS;`
	`594`	`+ GC_NOTRIGGER;`
`595`	`595`	`}`
`596`	`596`	`CONTRACTL_END;`
`597`	`597`
`@@ -704,7 +704,7 @@ struct FixupPrecode {`
`704`	`704`	`CONTRACTL`
`705`	`705`	`{`
`706`	`706`	`THROWS;`
`707`		`- GC_TRIGGERS;`
	`707`	`+ GC_NOTRIGGER;`
`708`	`708`	`}`
`709`	`709`	`CONTRACTL_END;`
`710`	`710`
`@@ -717,7 +717,7 @@ struct FixupPrecode {`
`717`	`717`	`CONTRACTL`
`718`	`718`	`{`
`719`	`719`	`THROWS;`
`720`		`- GC_TRIGGERS;`
	`720`	`+ GC_NOTRIGGER;`
`721`	`721`	`}`
`722`	`722`	`CONTRACTL_END;`
`723`	`723`
`@@ -778,7 +778,7 @@ struct ThisPtrRetBufPrecode {`
`778`	`778`	`CONTRACTL`
`779`	`779`	`{`
`780`	`780`	`THROWS;`
`781`		`- GC_TRIGGERS;`
	`781`	`+ GC_NOTRIGGER;`
`782`	`782`	`}`
`783`	`783`	`CONTRACTL_END;`
`784`	`784`