clang: Disable source order sorting for now. (#2558)

* clang: Clean up source order sorting. This doesn't change behavior but is easier to debug and reason about (because you have the relevant cursors there). * clang: Disable source order sorting for now. This disables (hopefully temporarily) source order sorting, for causing correctness regressions like #2556. Fixes #2556. * tests: Add a test for #2556 * Remove merge artifact * Update clang.rs --------- Co-authored-by: Christian Poveda Ruiz <[email protected]>
rust-lang · Jun 15, 2023 · 6020f89 · 6020f89
1 parent 2034a0f
commit 6020f89
Show file tree

Hide file tree

Showing 15 changed files with 160 additions and 86 deletions.
diff --git a/bindgen-tests/tests/expectations/tests/allowlist-file.rs b/bindgen-tests/tests/expectations/tests/allowlist-file.rs
diff --git a/bindgen-tests/tests/expectations/tests/issue-2556.rs b/bindgen-tests/tests/expectations/tests/issue-2556.rs
diff --git a/bindgen-tests/tests/expectations/tests/jsval_layout_opaque.rs b/bindgen-tests/tests/expectations/tests/jsval_layout_opaque.rs
diff --git a/bindgen-tests/tests/expectations/tests/jsval_layout_opaque_1_0.rs b/bindgen-tests/tests/expectations/tests/jsval_layout_opaque_1_0.rs
diff --git a/bindgen-tests/tests/expectations/tests/layout_arp.rs b/bindgen-tests/tests/expectations/tests/layout_arp.rs
diff --git a/bindgen-tests/tests/expectations/tests/layout_array.rs b/bindgen-tests/tests/expectations/tests/layout_array.rs
diff --git a/bindgen-tests/tests/expectations/tests/layout_eth_conf.rs b/bindgen-tests/tests/expectations/tests/layout_eth_conf.rs
diff --git a/bindgen-tests/tests/expectations/tests/layout_eth_conf_1_0.rs b/bindgen-tests/tests/expectations/tests/layout_eth_conf_1_0.rs
diff --git a/bindgen-tests/tests/expectations/tests/namespace.rs b/bindgen-tests/tests/expectations/tests/namespace.rs
diff --git a/bindgen-tests/tests/expectations/tests/template_instantiation_with_fn_local_type.rs b/bindgen-tests/tests/expectations/tests/template_instantiation_with_fn_local_type.rs
diff --git a/bindgen-tests/tests/headers/issue-2556.h b/bindgen-tests/tests/headers/issue-2556.h
@@ -0,0 +1,4 @@
+// bindgen-flags: --enable-cxx-namespaces -- -x c++ -Itests/headers -include tests/headers/issue-2556/nsStyleStruct.h -include tests/headers/issue-2556/LayoutConstants.h
+
+#include "issue-2556/nsSize.h"
+#include "issue-2556/nsStyleStruct.h"
diff --git a/bindgen-tests/tests/headers/issue-2556/LayoutConstants.h b/bindgen-tests/tests/headers/issue-2556/LayoutConstants.h
@@ -0,0 +1,7 @@
+#include "nsSize.h"
+
+namespace foo {
+
+static constexpr nsSize kFallbackIntrinsicSize(0, 0);
+
+}
diff --git a/bindgen-tests/tests/headers/issue-2556/nsSize.h b/bindgen-tests/tests/headers/issue-2556/nsSize.h
@@ -0,0 +1,6 @@
+#pragma once
+
+struct nsSize {
+  int width, height;
+  constexpr nsSize(int aWidth, int aHeight) : width(aWidth), height(aHeight) {}
+};
diff --git a/bindgen-tests/tests/headers/issue-2556/nsStyleStruct.h b/bindgen-tests/tests/headers/issue-2556/nsStyleStruct.h
@@ -0,0 +1,3 @@
+#pragma once
+
+#include "nsSize.h"