Add const-correctness to the scope of destruct call

Author: aaronj0

include/CppInterOp/CppInterOp.h

@@ -35,6 +35,7 @@
 namespace Cpp {
 using TCppIndex_t = size_t;
 using TCppScope_t = void*;
+using TCppConstScope_t = const void*;
 using TCppType_t = void*;
 using TCppFunction_t = void*;
 using TCppConstFunction_t = const void*;
@@ -868,7 +869,7 @@ CPPINTEROP_API TCppObject_t Construct(TCppScope_t scope, void* arena = nullptr,
 /// \param[in] count indicate the number of objects to destruct, if \c This
 /// points to an array of objects
 /// \returns true if wrapper generation and invocation succeeded.
-CPPINTEROP_API bool Destruct(TCppObject_t This, TCppScope_t type,
+CPPINTEROP_API bool Destruct(TCppObject_t This, TCppConstScope_t type,
                              bool withFree = true, TCppIndex_t count = 0UL);
 
 /// @name Stream Redirection

lib/CppInterOp/CXCppInterOp.cpp

@@ -614,7 +614,7 @@ void clang_invoke(CXScope func, void* result, void** args, size_t n,
 
 namespace Cpp {
 bool Destruct(compat::Interpreter& interp, TCppObject_t This,
-              clang::Decl* Class, bool withFree, size_t nary);
+              const clang::Decl* Class, bool withFree, size_t nary);
 } // namespace Cpp
 
 bool clang_destruct(CXObject This, CXScope S, bool withFree, size_t nary) {

lib/CppInterOp/CppInterOp.cpp

@@ -3812,7 +3812,7 @@ TCppObject_t Construct(TCppScope_t scope, void* arena /*=nullptr*/,
   return Construct(getInterp(), scope, arena, count);
 }
 
-bool Destruct(compat::Interpreter& interp, TCppObject_t This, Decl* Class,
+bool Destruct(compat::Interpreter& interp, TCppObject_t This, const Decl* Class,
               bool withFree, TCppIndex_t nary) {
   if (auto wrapper = make_dtor_wrapper(interp, Class)) {
     (*wrapper)(This, nary, withFree);
@@ -3822,9 +3822,9 @@ bool Destruct(compat::Interpreter& interp, TCppObject_t This, Decl* Class,
   // FIXME: Enable stronger diagnostics
 }
 
-bool Destruct(TCppObject_t This, TCppScope_t scope, bool withFree /*=true*/,
-              TCppIndex_t count /*=0UL*/) {
-  auto* Class = static_cast<Decl*>(scope);
+bool Destruct(TCppObject_t This, TCppConstScope_t scope,
+              bool withFree /*=true*/, TCppIndex_t count /*=0UL*/) {
+  const auto* Class = static_cast<const Decl*>(scope);
   return Destruct(getInterp(), This, Class, withFree, count);
 }