Address review comments

Author: vgvassilev

clang/include/clang/Interpreter/Interpreter.h

@@ -189,7 +189,7 @@ class Interpreter {
   // clang::Values.
   mutable llvm::DenseMap<CXXRecordDecl *, llvm::orc::ExecutorAddr> Dtors;
 
-  std::array<Expr *, 4> ValuePrintingInfo;
+  std::array<Expr *, 4> ValuePrintingInfo = {0};
 
   std::unique_ptr<llvm::orc::LLJITBuilder> JITBuilder;
 

clang/include/clang/Interpreter/Value.h

@@ -35,13 +35,16 @@
 
 #include "llvm/Config/llvm-config.h" // for LLVM_BUILD_LLVM_DYLIB, LLVM_BUILD_SHARED_LIBS
 #include "llvm/Support/Compiler.h"
+#include <cassert>
 #include <cstdint>
 
 // NOTE: Since the REPL itself could also include this runtime, extreme caution
 // should be taken when MAKING CHANGES to this file, especially when INCLUDE NEW
 // HEADERS, like <string>, <memory> and etc. (That pulls a large number of
 // tokens and will impact the runtime performance of the REPL)
 
+extern "C" void *memcpy(void *dest, const void *src, size_t n);
+
 namespace llvm {
 class raw_ostream;
 
@@ -97,6 +100,7 @@ class REPL_EXTERNAL_VISIBILITY Value {
     REPL_BUILTIN_TYPES
 #undef X
     void *m_Ptr;
+    unsigned char m_RawBits[sizeof(long double) * 8]; // widest type
   };
 
 public:
@@ -138,6 +142,10 @@ class REPL_EXTERNAL_VISIBILITY Value {
 
   void *getPtr() const;
   void setPtr(void *Ptr) { Data.m_Ptr = Ptr; }
+  void setRawBits(void *Ptr, unsigned NBits = sizeof(Storage)) {
+    assert(NBits <= sizeof(Storage) && "Greater than the total size");
+    memcpy(/*dest=*/Data.m_RawBits, /*src=*/Ptr, /*nbytes=*/NBits / 8);
+  }
 
 #define X(type, name)                                                          \
   void set##name(type Val) { Data.m_##name = Val; }                            \

clang/lib/Interpreter/Interpreter.cpp

@@ -815,13 +815,13 @@ Interpreter::GenModule(IncrementalAction *Action) {
     // of the module which does not map well to CodeGen's design. To work this
     // around we created an empty module to make CodeGen happy. We should make
     // sure it always stays empty.
-    assert((!CachedInCodeGenModule ||
-            !getCompilerInstance()->getPreprocessorOpts().Includes.empty()) ||
-           ((CachedInCodeGenModule->empty() &&
-             CachedInCodeGenModule->global_empty() &&
-             CachedInCodeGenModule->alias_empty() &&
-             CachedInCodeGenModule->ifunc_empty())) &&
-               "CodeGen wrote to a readonly module");
+    assert(((!CachedInCodeGenModule ||
+             !getCompilerInstance()->getPreprocessorOpts().Includes.empty()) ||
+            ((CachedInCodeGenModule->empty() &&
+              CachedInCodeGenModule->global_empty() &&
+              CachedInCodeGenModule->alias_empty() &&
+              CachedInCodeGenModule->ifunc_empty()))) &&
+           "CodeGen wrote to a readonly module");
     std::unique_ptr<llvm::Module> M(CG->ReleaseModule());
     CG->StartModule("incr_module_" + std::to_string(ID++), M->getContext());
     return M;

clang/lib/Interpreter/InterpreterValuePrinter.cpp

@@ -184,7 +184,6 @@ struct ValueRef : public Value {
     // Tell the base class to not try to deallocate if it manages the value.
     IsManuallyAlloc = false;
   }
-  void setData(long double D) { Data.m_LongDouble = D; }
 };
 
 std::string Interpreter::ValueDataToString(const Value &V) const {
@@ -212,7 +211,7 @@ std::string Interpreter::ValueDataToString(const Value &V) const {
       if (ElemTy->isBuiltinType()) {
         // Single dim arrays, advancing.
         uintptr_t Offset = (uintptr_t)V.getPtr() + Idx * ElemSize;
-        InnerV.setData(*(long double *)Offset);
+        InnerV.setRawBits((void *)Offset, ElemSize * 8);
       } else {
         // Multi dim arrays, position to the next dimension.
         size_t Stride = ElemCount / N;

clang/test/Interpreter/pretty-print.c

@@ -70,7 +70,9 @@ float farr[2][1] = { {0}, {3.14}}; farr
 0.00001f
 // CHECK-NEXT: (float) 1.00000e-05f
 
-
+// TODO: _Bool, _Complex, _Atomic, and _BitInt
+// union U { int I; float F; } u; u.I = 12; u.I
+// TODO-CHECK-NEXT: (int) 12
 // struct S1{} s1; s1
 // TODO-CHECK-NEXT: (S1 &) @0x{{[0-9a-f]+}}
 

clang/test/Interpreter/pretty-print.cpp

@@ -26,6 +26,7 @@ s3
 struct S4 { ~S4() { printf("~S4()\n"); }};
 S4{}
 // CHECK-NEXT: (S4) @0x{{[0-9a-f]+}}
+// TODO-CHECK-NEXT: ~S4()
 
 enum Enum{ e1 = -12, e2, e3=33, e4, e5 = 33};
 e2