Partial work for reference fix

google · Jun 28, 2023 · e80dc35 · e80dc35
1 parent 7d3159a
commit e80dc35
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 5 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -34,8 +34,8 @@ moveit = { version = "0.6", features = [ "cxx" ] }
 members = ["parser", "engine", "gen/cmd", "gen/build", "macro", "demo", "tools/reduce", "tools/mdbook-preprocessor", "integration-tests"]
 exclude = ["examples/s2", "examples/steam-mini", "examples/subclass", "examples/chromium-fake-render-frame-host", "examples/pod", "examples/non-trivial-type-on-stack", "examples/llvm", "examples/reference-wrappers", "examples/cpp_calling_rust", "tools/stress-test"]
 
-#[patch.crates-io]
+[patch.crates-io]
 #cxx = { path="../cxx" }
 #cxx-gen = { path="../cxx/gen/lib" }
-#autocxx-bindgen = { path="../bindgen" }
+autocxx-bindgen = { path="../bindgen/bindgen" }
 #moveit = { path="../moveit" }
diff --git a/engine/src/conversion/analysis/tdef.rs b/engine/src/conversion/analysis/tdef.rs
@@ -120,6 +120,7 @@ fn get_replacement_typedef(
                 name,
                 item: TypedefKind::Type(ity.into()),
                 old_tyname,
+                is_reference,
                 analysis: TypedefAnalysis {
                     kind: TypedefKind::Type(converted_type.into()),
                     deps: final_type.types_encountered,

diff --git a/engine/src/conversion/api.rs b/engine/src/conversion/api.rs
@@ -511,6 +511,7 @@ pub(crate) enum Api<T: AnalysisPhase> {
         name: ApiName,
         item: TypedefKind,
         old_tyname: Option<QualifiedName>,
+        is_reference: bool,
         analysis: T::TypedefAnalysis,
     },
     /// An enum encountered in the
@@ -666,6 +667,7 @@ impl<T: AnalysisPhase> Api<T> {
         name: ApiName,
         item: TypedefKind,
         old_tyname: Option<QualifiedName>,
+        is_reference: bool,
         analysis: T::TypedefAnalysis,
     ) -> Result<Box<dyn Iterator<Item = Api<T>>>, ConvertErrorWithContext>
     where
@@ -675,6 +677,7 @@ impl<T: AnalysisPhase> Api<T> {
             name,
             item,
             old_tyname,
+            is_reference,
             analysis,
         })))
     }

diff --git a/engine/src/conversion/error_reporter.rs b/engine/src/conversion/error_reporter.rs
@@ -83,6 +83,7 @@ pub(crate) fn convert_apis<FF, SF, EF, TF, A, B: 'static>(
         ApiName,
         TypedefKind,
         Option<QualifiedName>,
+        bool,
         A::TypedefAnalysis,
     ) -> Result<Box<dyn Iterator<Item = Api<B>>>, ConvertErrorWithContext>,
 {
@@ -172,8 +173,9 @@ pub(crate) fn convert_apis<FF, SF, EF, TF, A, B: 'static>(
                 name,
                 item,
                 old_tyname,
+                is_reference,
                 analysis,
-            } => typedef_conversion(name, item, old_tyname, analysis),
+            } => typedef_conversion(name, item, old_tyname, is_reference, analysis),
             Api::Function {
                 name,
                 fun,

diff --git a/engine/src/conversion/parse/parse_bindgen.rs b/engine/src/conversion/parse/parse_bindgen.rs
@@ -333,6 +333,7 @@ impl<'a> ParseBindgen<'a> {
                                     },
                                     Box::new(Type::Path(old_path).into()),
                                 ),
+                                is_reference: false,
                                 old_tyname: Some(old_tyname),
                                 analysis: (),
                             });
@@ -373,12 +374,14 @@ impl<'a> ParseBindgen<'a> {
             }
             Item::Type(ity) => {
                 let annotations = BindgenSemanticAttributes::new(&ity.attrs);
+                let is_reference = annotations.has_attr("reference");
                 // It's known that sometimes bindgen will give us duplicate typedefs with the
                 // same name - see test_issue_264.
                 self.apis.push(UnanalyzedApi::Typedef {
                     name: api_name(ns, ity.ident.clone(), &annotations),
                     item: TypedefKind::Type(ity.into()),
                     old_tyname: None,
+                    is_reference,
                     analysis: (),
                 });
                 Ok(())