Rollup merge of rust-lang#82404 - nagisa:nagisa/hexagon-enums-llvm-comps, r=petrochenkov

Dylan-DPC · web-flow · commit 2d175bbd2c93 · 2021-02-27T02:34:25.000+01:00
Test hexagon-enum only when llvm target is present See rust-lang#82379 (comment) r? ``````@petrochenkov`````` ``````@bors`````` rollup
diff --git a/src/test/ui/layout/hexagon-enum.rs b/src/test/ui/layout/hexagon-enum.rs
@@ -1,4 +1,5 @@
 // compile-flags: --target hexagon-unknown-linux-musl
+// needs-llvm-components: hexagon
 //
 // Verify that the hexagon targets implement the repr(C) for enums correctly.
 //
diff --git a/src/test/ui/layout/hexagon-enum.stderr b/src/test/ui/layout/hexagon-enum.stderr
@@ -81,7 +81,7 @@ error: layout_of(A) = Layout {
         raw: 1,
     },
 }
-  --> $DIR/hexagon-enum.rs:15:1
+  --> $DIR/hexagon-enum.rs:16:1
    |
 LL | enum A { Apple }
    | ^^^^^^^^^^^^^^^^
@@ -169,7 +169,7 @@ error: layout_of(B) = Layout {
         raw: 1,
     },
 }
-  --> $DIR/hexagon-enum.rs:19:1
+  --> $DIR/hexagon-enum.rs:20:1
    |
 LL | enum B { Banana = 255, }
    | ^^^^^^^^^^^^^^^^^^^^^^^^
@@ -257,7 +257,7 @@ error: layout_of(C) = Layout {
         raw: 2,
     },
 }
-  --> $DIR/hexagon-enum.rs:23:1
+  --> $DIR/hexagon-enum.rs:24:1
    |
 LL | enum C { Chaenomeles = 256, }
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -345,7 +345,7 @@ error: layout_of(P) = Layout {
         raw: 4,
     },
 }
-  --> $DIR/hexagon-enum.rs:27:1
+  --> $DIR/hexagon-enum.rs:28:1
    |
 LL | enum P { Peach = 0x1000_0000isize, }
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -433,7 +433,7 @@ error: layout_of(T) = Layout {
         raw: 4,
     },
 }
-  --> $DIR/hexagon-enum.rs:33:1
+  --> $DIR/hexagon-enum.rs:34:1
    |
 LL | enum T { Tangerine = TANGERINE as isize }
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`// compile-flags: --target hexagon-unknown-linux-musl`
	`2`	`+// needs-llvm-components: hexagon`
`2`	`3`	`//`
`3`	`4`	`// Verify that the hexagon targets implement the repr(C) for enums correctly.`
`4`	`5`	`//`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ error: layout_of(A) = Layout {`
`81`	`81`	`raw: 1,`
`82`	`82`	`},`
`83`	`83`	`}`
`84`		`- --> $DIR/hexagon-enum.rs:15:1`
	`84`	`+ --> $DIR/hexagon-enum.rs:16:1`
`85`	`85`	`\|`
`86`	`86`	`LL \| enum A { Apple }`
`87`	`87`	`\| ^^^^^^^^^^^^^^^^`
`@@ -169,7 +169,7 @@ error: layout_of(B) = Layout {`
`169`	`169`	`raw: 1,`
`170`	`170`	`},`
`171`	`171`	`}`
`172`		`- --> $DIR/hexagon-enum.rs:19:1`
	`172`	`+ --> $DIR/hexagon-enum.rs:20:1`
`173`	`173`	`\|`
`174`	`174`	`LL \| enum B { Banana = 255, }`
`175`	`175`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^`
`@@ -257,7 +257,7 @@ error: layout_of(C) = Layout {`
`257`	`257`	`raw: 2,`
`258`	`258`	`},`
`259`	`259`	`}`
`260`		`- --> $DIR/hexagon-enum.rs:23:1`
	`260`	`+ --> $DIR/hexagon-enum.rs:24:1`
`261`	`261`	`\|`
`262`	`262`	`LL \| enum C { Chaenomeles = 256, }`
`263`	`263`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`@@ -345,7 +345,7 @@ error: layout_of(P) = Layout {`
`345`	`345`	`raw: 4,`
`346`	`346`	`},`
`347`	`347`	`}`
`348`		`- --> $DIR/hexagon-enum.rs:27:1`
	`348`	`+ --> $DIR/hexagon-enum.rs:28:1`
`349`	`349`	`\|`
`350`	`350`	`LL \| enum P { Peach = 0x1000_0000isize, }`
`351`	`351`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`@@ -433,7 +433,7 @@ error: layout_of(T) = Layout {`
`433`	`433`	`raw: 4,`
`434`	`434`	`},`
`435`	`435`	`}`
`436`		`- --> $DIR/hexagon-enum.rs:33:1`
	`436`	`+ --> $DIR/hexagon-enum.rs:34:1`
`437`	`437`	`\|`
`438`	`438`	`LL \| enum T { Tangerine = TANGERINE as isize }`
`439`	`439`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`