summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/clang.rs50
-rw-r--r--src/ir/context.rs10
-rw-r--r--src/ir/item.rs2
-rw-r--r--src/ir/layout.rs4
-rw-r--r--src/ir/ty.rs6
5 files changed, 41 insertions, 31 deletions
diff --git a/src/clang.rs b/src/clang.rs
index 40ba60e8..e02d363f 100644
--- a/src/clang.rs
+++ b/src/clang.rs
@@ -7,6 +7,7 @@
use cexpr;
use clang_sys::*;
use regex;
+use ir::context::BindgenContext;
use std::{mem, ptr, slice};
use std::ffi::{CStr, CString};
use std::fmt;
@@ -933,35 +934,44 @@ impl Type {
#[inline]
fn is_non_deductible_auto_type(&self) -> bool {
- self.kind() == CXType_Auto && self.canonical_type() == *self
+ debug_assert_eq!(self.kind(), CXType_Auto);
+ self.canonical_type() == *self
}
#[inline]
- fn clang_size_of(&self) -> c_longlong {
- if self.is_non_deductible_auto_type() {
- return -6; // Work-around https://bugs.llvm.org/show_bug.cgi?id=40813
+ fn clang_size_of(&self, ctx: &BindgenContext) -> c_longlong {
+ match self.kind() {
+ // Work-around https://bugs.llvm.org/show_bug.cgi?id=40975
+ CXType_RValueReference |
+ CXType_LValueReference => ctx.target_pointer_size() as c_longlong,
+ // Work-around https://bugs.llvm.org/show_bug.cgi?id=40813
+ CXType_Auto if self.is_non_deductible_auto_type() => return -6,
+ _ => unsafe { clang_Type_getSizeOf(self.x) },
}
- unsafe { clang_Type_getSizeOf(self.x) }
}
#[inline]
- fn clang_align_of(&self) -> c_longlong {
- if self.is_non_deductible_auto_type() {
- return -6; // Work-around https://bugs.llvm.org/show_bug.cgi?id=40813
+ fn clang_align_of(&self, ctx: &BindgenContext) -> c_longlong {
+ match self.kind() {
+ // Work-around https://bugs.llvm.org/show_bug.cgi?id=40975
+ CXType_RValueReference |
+ CXType_LValueReference => ctx.target_pointer_size() as c_longlong,
+ // Work-around https://bugs.llvm.org/show_bug.cgi?id=40813
+ CXType_Auto if self.is_non_deductible_auto_type() => return -6,
+ _ => unsafe { clang_Type_getAlignOf(self.x) },
}
- unsafe { clang_Type_getAlignOf(self.x) }
}
/// What is the size of this type? Paper over invalid types by returning `0`
/// for them.
- pub fn size(&self) -> usize {
- let val = self.clang_size_of();
+ pub fn size(&self, ctx: &BindgenContext) -> usize {
+ let val = self.clang_size_of(ctx);
if val < 0 { 0 } else { val as usize }
}
/// What is the size of this type?
- pub fn fallible_size(&self) -> Result<usize, LayoutError> {
- let val = self.clang_size_of();
+ pub fn fallible_size(&self, ctx: &BindgenContext) -> Result<usize, LayoutError> {
+ let val = self.clang_size_of(ctx);
if val < 0 {
Err(LayoutError::from(val as i32))
} else {
@@ -971,14 +981,14 @@ impl Type {
/// What is the alignment of this type? Paper over invalid types by
/// returning `0`.
- pub fn align(&self) -> usize {
- let val = self.clang_align_of();
+ pub fn align(&self, ctx: &BindgenContext) -> usize {
+ let val = self.clang_align_of(ctx);
if val < 0 { 0 } else { val as usize }
}
/// What is the alignment of this type?
- pub fn fallible_align(&self) -> Result<usize, LayoutError> {
- let val = self.clang_align_of();
+ pub fn fallible_align(&self, ctx: &BindgenContext) -> Result<usize, LayoutError> {
+ let val = self.clang_align_of(ctx);
if val < 0 {
Err(LayoutError::from(val as i32))
} else {
@@ -988,10 +998,10 @@ impl Type {
/// Get the layout for this type, or an error describing why it does not
/// have a valid layout.
- pub fn fallible_layout(&self) -> Result<::ir::layout::Layout, LayoutError> {
+ pub fn fallible_layout(&self, ctx: &BindgenContext) -> Result<::ir::layout::Layout, LayoutError> {
use ir::layout::Layout;
- let size = self.fallible_size()?;
- let align = self.fallible_align()?;
+ let size = self.fallible_size(ctx)?;
+ let align = self.fallible_align(ctx)?;
Ok(Layout::new(size, align))
}
diff --git a/src/ir/context.rs b/src/ir/context.rs
index f9cd53f3..2626b3e5 100644
--- a/src/ir/context.rs
+++ b/src/ir/context.rs
@@ -1755,7 +1755,7 @@ If you encounter an error missing from this list, please file an issue or a PR!"
sub_name,
template_decl_cursor
.cur_type()
- .fallible_layout()
+ .fallible_layout(self)
.ok(),
sub_kind,
false,
@@ -1821,7 +1821,7 @@ If you encounter an error missing from this list, please file an issue or a PR!"
let name = if name.is_empty() { None } else { Some(name) };
let ty = Type::new(
name,
- ty.fallible_layout().ok(),
+ ty.fallible_layout(self).ok(),
type_kind,
ty.is_const(),
);
@@ -1977,7 +1977,7 @@ If you encounter an error missing from this list, please file an issue or a PR!"
is_const: bool,
) -> TypeId {
let spelling = ty.spelling();
- let layout = ty.fallible_layout().ok();
+ let layout = ty.fallible_layout(self).ok();
let type_kind = TypeKind::ResolvedTypeRef(wrapped_id);
let ty = Type::new(Some(spelling), layout, type_kind, is_const);
let item = Item::new(
@@ -2018,7 +2018,7 @@ If you encounter an error missing from this list, please file an issue or a PR!"
CXType_UShort => TypeKind::Int(IntKind::UShort),
CXType_WChar => {
TypeKind::Int(IntKind::WChar {
- size: ty.fallible_size().expect("Couldn't compute size of wchar_t?"),
+ size: ty.fallible_size(self).expect("Couldn't compute size of wchar_t?"),
})
},
CXType_Char16 => TypeKind::Int(IntKind::U16),
@@ -2056,7 +2056,7 @@ If you encounter an error missing from this list, please file an issue or a PR!"
let spelling = ty.spelling();
let is_const = ty.is_const();
- let layout = ty.fallible_layout().ok();
+ let layout = ty.fallible_layout(self).ok();
let ty = Type::new(Some(spelling), layout, type_kind, is_const);
let id = self.next_item_id();
let item =
diff --git a/src/ir/item.rs b/src/ir/item.rs
index eec64695..6df19be8 100644
--- a/src/ir/item.rs
+++ b/src/ir/item.rs
@@ -454,7 +454,7 @@ impl Item {
ty: &clang::Type,
ctx: &mut BindgenContext,
) -> TypeId {
- let ty = Opaque::from_clang_ty(ty);
+ let ty = Opaque::from_clang_ty(ty, ctx);
let kind = ItemKind::Type(ty);
let parent = ctx.root_module().into();
ctx.add_item(Item::new(with_id, None, None, parent, kind), None, None);
diff --git a/src/ir/layout.rs b/src/ir/layout.rs
index c34da0e1..c70d2884 100644
--- a/src/ir/layout.rs
+++ b/src/ir/layout.rs
@@ -100,8 +100,8 @@ pub struct Opaque(pub Layout);
impl Opaque {
/// Construct a new opaque type from the given clang type.
- pub fn from_clang_ty(ty: &clang::Type) -> Type {
- let layout = Layout::new(ty.size(), ty.align());
+ pub fn from_clang_ty(ty: &clang::Type, ctx: &BindgenContext) -> Type {
+ let layout = Layout::new(ty.size(ctx), ty.align(ctx));
let ty_kind = TypeKind::Opaque;
let is_const = ty.is_const();
Type::new(None, Some(layout), ty_kind, is_const)
diff --git a/src/ir/ty.rs b/src/ir/ty.rs
index 922146ea..73309330 100644
--- a/src/ir/ty.rs
+++ b/src/ir/ty.rs
@@ -730,7 +730,7 @@ impl Type {
}
}
- let layout = ty.fallible_layout().ok();
+ let layout = ty.fallible_layout(ctx).ok();
let cursor = ty.declaration();
let mut name = cursor.spelling();
@@ -780,7 +780,7 @@ impl Type {
opaque type instead."
);
return Ok(
- ParseResult::New(Opaque::from_clang_ty(&canonical_ty), None),
+ ParseResult::New(Opaque::from_clang_ty(&canonical_ty, ctx), None),
);
}
@@ -912,7 +912,7 @@ impl Type {
from class template or base \
specifier, using opaque blob"
);
- let opaque = Opaque::from_clang_ty(ty);
+ let opaque = Opaque::from_clang_ty(ty, ctx);
return Ok(
ParseResult::New(opaque, None),
);
generated by cgit v1.2.3 (git 2.46.0) at 2025-07-01 18:21:31 +0000