Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -56,18 +56,18 @@ dependencies = [

[[package]]
name = "gccjit"
version = "3.7.0"
version = "4.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "37885008422371f81d654ddfbf9b8ab3c5e1b0b54146bf5ff4b74ae91812e8ba"
checksum = "be5dafc4e649cb4a363e95a5960ef50b0c6f1b8e136ff8eb2e928b40353b5d8b"
dependencies = [
"gccjit_sys",
]

[[package]]
name = "gccjit_sys"
version = "1.7.0"
version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e00d0323f55a3b71b302620571d44cd45fd05b4eb6bba6dd7f716095b8ab8cf"
checksum = "ab6a00a243aba2a45442bfd72b28d871137d4dac094f13de7f48cf9705112ffe"
dependencies = [
"libc",
]
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ default = ["master"]
[dependencies]
object = { version = "0.37.0", default-features = false, features = ["std", "read"] }
tempfile = "3.20"
gccjit = { version = "3.7.0", features = ["dlopen"] }
gccjit = { version = "4.0.0", features = ["dlopen"] }
#gccjit = { git = "https://github.com/rust-lang/gccjit.rs", branch = "error-dlopen", features = ["dlopen"] }

# Local copy.
Expand Down
2 changes: 1 addition & 1 deletion libgccjit.version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
b794cb99508e7eccd40fa42bb310d5781e09899b
f4e8afdf96ef77e2cb2cb07db370379b7f5c4f6f
10 changes: 6 additions & 4 deletions src/intrinsic/llvm.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
use std::borrow::Cow;

#[cfg(feature = "master")]
use gccjit::TypeAttribute;
use gccjit::{CType, Context, Field, Function, FunctionPtrType, RValue, ToRValue, Type};
use rustc_codegen_ssa::traits::BuilderMethods;

Expand All @@ -23,7 +25,7 @@ fn encode_key_128_type<'a, 'gcc, 'tcx>(
&[field1, field2, field3, field4, field5, field6, field7],
);
#[cfg(feature = "master")]
encode_type.as_type().set_packed();
encode_type.as_type().add_attribute(TypeAttribute::Packed);
(encode_type.as_type(), field1, field2)
}

Expand All @@ -45,7 +47,7 @@ fn encode_key_256_type<'a, 'gcc, 'tcx>(
&[field1, field2, field3, field4, field5, field6, field7, field8],
);
#[cfg(feature = "master")]
encode_type.as_type().set_packed();
encode_type.as_type().add_attribute(TypeAttribute::Packed);
(encode_type.as_type(), field1, field2)
}

Expand All @@ -58,7 +60,7 @@ fn aes_output_type<'a, 'gcc, 'tcx>(
let aes_output_type = builder.context.new_struct_type(None, "AesOutput", &[field1, field2]);
let typ = aes_output_type.as_type();
#[cfg(feature = "master")]
typ.set_packed();
typ.add_attribute(TypeAttribute::Packed);
(typ, field1, field2)
}

Expand All @@ -81,7 +83,7 @@ fn wide_aes_output_type<'a, 'gcc, 'tcx>(
&[field1, field2, field3, field4, field5, field6, field7, field8, field9],
);
#[cfg(feature = "master")]
aes_output_type.as_type().set_packed();
aes_output_type.as_type().add_attribute(TypeAttribute::Packed);
(aes_output_type.as_type(), field1, field2)
}

Expand Down
6 changes: 3 additions & 3 deletions src/type_.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
use std::convert::TryInto;

#[cfg(feature = "master")]
use gccjit::CType;
use gccjit::{CType, TypeAttribute};
use gccjit::{RValue, Struct, Type};
use rustc_abi::{AddressSpace, Align, Integer, Size};
use rustc_codegen_ssa::common::TypeKind;
Expand Down Expand Up @@ -116,7 +116,7 @@ impl<'gcc, 'tcx> CodegenCx<'gcc, 'tcx> {
let typ = self.context.new_struct_type(None, "struct", &fields).as_type();
if packed {
#[cfg(feature = "master")]
typ.set_packed();
typ.add_attribute(TypeAttribute::Packed);
}
self.struct_types.borrow_mut().insert(types, typ);
typ
Expand Down Expand Up @@ -333,7 +333,7 @@ impl<'gcc, 'tcx> CodegenCx<'gcc, 'tcx> {
typ.set_fields(None, &fields);
if packed {
#[cfg(feature = "master")]
typ.as_type().set_packed();
typ.as_type().add_attribute(TypeAttribute::Packed);
}
}

Expand Down
Loading