Add option to output constexpr generated constant primitive values

AlaskanEmily · emilio · commit 462871695d62 · 2020-03-03T20:46:12.000+01:00
This is controlled by the [const] allow_constexpr option, similar to the
allow_static_const option.

It's only applied to primitives currently.
diff --git a/docs.md b/docs.md
@@ -786,6 +786,11 @@ private_default_tagged_enum_constructor = false
 # default: true
 allow_static_const = true
 
+# Whether a generated constant can be constexpr in C++ mode.
+#
+# default: false
+allow_constexpr = false
+
 
 
 
diff --git a/src/bindgen/config.rs b/src/bindgen/config.rs
@@ -555,12 +555,15 @@ impl EnumConfig {
 pub struct ConstantConfig {
     /// Whether a generated constant can be a static const in C++ mode.
     pub allow_static_const: bool,
+    /// Whether a generated constant should be constexpr in C++ mode.
+    pub allow_constexpr: bool,
 }
 
 impl Default for ConstantConfig {
     fn default() -> ConstantConfig {
         ConstantConfig {
             allow_static_const: true,
+            allow_constexpr: false,
         }
     }
 }
diff --git a/src/bindgen/ir/constant.rs b/src/bindgen/ir/constant.rs
@@ -491,12 +491,24 @@ impl Constant {
 
         self.documentation.write(config, out);
 
-        if config.constant.allow_static_const && config.language == Language::Cxx {
-            out.write(if in_body { "inline " } else { "static " });
-            if let Type::ConstPtr(..) = self.ty {
-                // Nothing.
+        let allow_constexpr = if let Type::Primitive(..) = self.ty {
+            config.constant.allow_constexpr
+        } else {
+            false
+        };
+
+        if (config.constant.allow_static_const || allow_constexpr)
+            && config.language == Language::Cxx
+        {
+            if allow_constexpr {
+                out.write("constexpr ")
             } else {
-                out.write("const ");
+                out.write(if in_body { "inline " } else { "static " });
+                if let Type::ConstPtr(..) = self.ty {
+                    // Nothing.
+                } else {
+                    out.write("const ");
+                }
             }
             self.ty.write(config, out);
             write!(out, " {} = ", name);
diff --git a/tests/expectations/constant_constexpr.c b/tests/expectations/constant_constexpr.c
@@ -0,0 +1,18 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#define CONSTANT_FLOAT32 312.292
+
+#define CONSTANT_I64 216
+
+#define DELIMITER ':'
+
+#define LEFTCURLY '{'
+
+typedef struct {
+  int32_t x;
+} Foo;
+
+#define SomeFoo (Foo){ .x = 99 }
diff --git a/tests/expectations/constant_constexpr.compat.c b/tests/expectations/constant_constexpr.compat.c
@@ -0,0 +1,18 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#define CONSTANT_FLOAT32 312.292
+
+#define CONSTANT_I64 216
+
+#define DELIMITER ':'
+
+#define LEFTCURLY '{'
+
+typedef struct {
+  int32_t x;
+} Foo;
+
+#define SomeFoo (Foo){ .x = 99 }
diff --git a/tests/expectations/constant_constexpr.cpp b/tests/expectations/constant_constexpr.cpp
@@ -0,0 +1,18 @@
+#include <cstdarg>
+#include <cstdint>
+#include <cstdlib>
+#include <new>
+
+constexpr float CONSTANT_FLOAT32 = 312.292;
+
+constexpr int64_t CONSTANT_I64 = 216;
+
+constexpr uint32_t DELIMITER = ':';
+
+constexpr uint32_t LEFTCURLY = '{';
+
+struct Foo {
+  int32_t x;
+};
+
+static const Foo SomeFoo = Foo{ /* .x = */ 99 };
diff --git a/tests/rust/constant_constexpr.rs b/tests/rust/constant_constexpr.rs
@@ -0,0 +1,11 @@
+pub const SomeName: &'static str = "hello world";
+pub const CONSTANT_I64: i64 = 216;
+pub const CONSTANT_FLOAT32: f32 = 312.292;
+pub const DELIMITER: char = ':';
+pub const LEFTCURLY: char = '{';
+#[repr(C)]
+struct Foo {
+    x: i32,
+}
+
+pub const SomeFoo: Foo = Foo{ x: 99, };
diff --git a/tests/rust/constant_constexpr.toml b/tests/rust/constant_constexpr.toml
@@ -0,0 +1,3 @@
+[const]
+allow_constexpr = true
+allow_static_const = true

Original file line number	Diff line number	Diff line change
`@@ -555,12 +555,15 @@ impl EnumConfig {`
`555`	`555`	`pub struct ConstantConfig {`
`556`	`556`	`/// Whether a generated constant can be a static const in C++ mode.`
`557`	`557`	`pub allow_static_const: bool,`
	`558`	`+ /// Whether a generated constant should be constexpr in C++ mode.`
	`559`	`+ pub allow_constexpr: bool,`
`558`	`560`	`}`
`559`	`561`
`560`	`562`	`impl Default for ConstantConfig {`
`561`	`563`	`fn default() -> ConstantConfig {`
`562`	`564`	`ConstantConfig {`
`563`	`565`	`allow_static_const: true,`
	`566`	`+ allow_constexpr: false,`
`564`	`567`	`}`
`565`	`568`	`}`
`566`	`569`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+[const]`
	`2`	`+allow_constexpr = true`
	`3`	`+allow_static_const = true`