From 387a38dbc69902e1a90e62e4198fb29b1b807789 Mon Sep 17 00:00:00 2001
From: Andreas Fertig <andy@cppinsights.io>
Date: Wed, 5 Feb 2025 18:03:15 +0100
Subject: [PATCH] Fixed static visualization for types with a trivial
 constructor.

---
 InsightsHelpers.cpp             |  2 +-
 tests/StaticHandler7Test.cpp    | 16 ++++++++++++++
 tests/StaticHandler7Test.expect | 37 +++++++++++++++++++++++++++++++++
 3 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 tests/StaticHandler7Test.cpp
 create mode 100644 tests/StaticHandler7Test.expect

diff --git a/InsightsHelpers.cpp b/InsightsHelpers.cpp
index 44beb098..a8896a2e 100644
--- a/InsightsHelpers.cpp
+++ b/InsightsHelpers.cpp
@@ -1389,7 +1389,7 @@ bool IsTrivialStaticClassVarDecl(const VarDecl& varDecl)
     // Should the VarDecl be evaluatable at compile-time, there is no additional guard added by the compiler.
     if(varDecl.isStaticLocal() and not IsEvaluatable(varDecl)) {
         if(const auto* cxxRecordDecl = varDecl.getType()->getAsCXXRecordDecl()) {
-            if(cxxRecordDecl->hasNonTrivialDestructor() or cxxRecordDecl->hasNonTrivialDefaultConstructor()) {
+            if(cxxRecordDecl->hasNonTrivialDestructor() or not cxxRecordDecl->hasTrivialDefaultConstructor()) {
                 return true;
             }
         }
diff --git a/tests/StaticHandler7Test.cpp b/tests/StaticHandler7Test.cpp
new file mode 100644
index 00000000..a6cbeb3c
--- /dev/null
+++ b/tests/StaticHandler7Test.cpp
@@ -0,0 +1,16 @@
+struct Data
+{
+  int i;
+  
+  Data(int x)
+  : i{x}
+  {
+  }
+};
+
+Data& Fun(int x)
+{
+  static Data mData{x};
+  
+  return mData;
+}
diff --git a/tests/StaticHandler7Test.expect b/tests/StaticHandler7Test.expect
new file mode 100644
index 00000000..83618a99
--- /dev/null
+++ b/tests/StaticHandler7Test.expect
@@ -0,0 +1,37 @@
+#include <new> // for thread-safe static's placement new
+#include <stdint.h> // for uint64_t under Linux/GCC
+
+struct Data
+{
+  int i;
+  inline Data(int x)
+  : i{x}
+  {
+  }
+  
+};
+
+
+Data & Fun(int x)
+{
+  static uint64_t __mDataGuard;
+  alignas(Data) static char __mData[sizeof(Data)];
+  
+  if((__mDataGuard & 255) == 0) {
+    if(__cxa_guard_acquire(&__mDataGuard)) {
+      try 
+      {
+        new (&__mData)Data{x};
+        __mDataGuard = true;
+      } catch(...) {
+        __cxa_guard_abort(&__mDataGuard);
+        throw ;
+      }
+      __cxa_guard_release(&__mDataGuard);
+      /* __cxa_atexit(Data::~Data, &__mData, &__dso_handle); */
+    } 
+    
+  } 
+  
+  return *reinterpret_cast<Data*>(__mData);
+}