about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAntoni Boucher <bouanto@zoho.com>2022-05-04 22:20:38 -0400
committerAntoni Boucher <bouanto@zoho.com>2022-05-04 22:20:38 -0400
commit4a9744059f8617756c4ee981e033ad8b6f6e05d3 (patch)
tree6180c2b3b742367d6c93dc66aff564ee69eba60f
parente7df0a4b549e5d3b4aec0cc79c4262c5a2dfef13 (diff)
downloadrust-4a9744059f8617756c4ee981e033ad8b6f6e05d3.tar.gz
rust-4a9744059f8617756c4ee981e033ad8b6f6e05d3.zip
Feature gate call to get_size() for libgccjit 12
-rw-r--r--src/builder.rs7
-rw-r--r--src/intrinsic/archs.rs5
2 files changed, 7 insertions, 5 deletions
diff --git a/src/builder.rs b/src/builder.rs
index d4fd6a6877f..8fa78c7e189 100644
--- a/src/builder.rs
+++ b/src/builder.rs
@@ -1326,7 +1326,12 @@ impl<'a, 'gcc, 'tcx> Builder<'a, 'gcc, 'tcx> {
                 element_type
             }
             else {
-                self.cx.type_ix(element_type.get_size() as u64 * 8)
+                #[cfg(feature="master")]
+                {
+                    self.cx.type_ix(element_type.get_size() as u64 * 8)
+                }
+                #[cfg(not(feature="master"))]
+                self.int_type
             };
         for i in 0..mask_num_units {
             let field = struct_type.get_field(i as i32);
diff --git a/src/intrinsic/archs.rs b/src/intrinsic/archs.rs
index fbcfc8be859..bfeb30f2913 100644
--- a/src/intrinsic/archs.rs
+++ b/src/intrinsic/archs.rs
@@ -4275,8 +4275,5 @@ match name {
     "llvm.xcore.getid" => "__builtin_getid",
     "llvm.xcore.getps" => "__builtin_getps",
     "llvm.xcore.setps" => "__builtin_setps",
-    _ => {
-        println!("***** unsupported LLVM intrinsic {}", name);
-        ""
-    },
+    _ => unimplemented!("***** unsupported LLVM intrinsic {}", name),
 }