changes according to code review

Author: Vipul-Cariappa

include/clang/Interpreter/CppInterOp.h

@@ -547,10 +547,10 @@ namespace Cpp {
   CPPINTEROP_API TCppType_t GetCanonicalType(TCppType_t type);
 
   /// Get non restrict qualified version of the given type
-  CPPINTEROP_API TCppType_t GetNonRestrictQualifiedType(TCppType_t type);
+  CPPINTEROP_API TCppType_t GetNonRestrictType(TCppType_t type);
 
   /// check if the type is restrict qualified i.e. __restrict
-  CPPINTEROP_API bool IsRestrictQualifiedType(TCppType_t type);
+  CPPINTEROP_API bool IsRestrictType(TCppType_t type);
 
   /// Used to either get the built-in type of the provided string, or
   /// use the name to lookup the actual type.

lib/Interpreter/CppInterOp.cpp

@@ -1657,23 +1657,19 @@ namespace Cpp {
     return QT.getCanonicalType().getAsOpaquePtr();
   }
 
-  bool IsRestrictQualifiedType(TCppType_t type) {
-    if (!type)
-      return 0;
+  bool IsRestrictType(TCppType_t type) {
     QualType QT = QualType::getFromOpaquePtr(type);
     return QT.isRestrictQualified();
   }
 
-  TCppType_t GetNonRestrictQualifiedType(TCppType_t type) {
-    if (!type)
-      return 0;
+  TCppType_t GetNonRestrictType(TCppType_t type) {
     QualType QT = QualType::getFromOpaquePtr(type);
     if (QT.isRestrictQualified()) {
       QualType NonRestrictType(QT);
       NonRestrictType.removeLocalRestrict();
       return NonRestrictType.getAsOpaquePtr();
     }
-    return nullptr;
+    return type;
   }
 
   // Internal functions that are not needed outside the library are

unittests/CppInterOp/TypeReflectionTest.cpp

@@ -621,10 +621,11 @@ TEST(TypeReflectionTest, RestrictQualifiedType) {
   Cpp::TCppType_t x = Cpp::GetVariableType(Cpp::GetNamed("x"));
   Cpp::TCppType_t y = Cpp::GetVariableType(Cpp::GetNamed("y"));
 
-  EXPECT_FALSE(Cpp::IsRestrictQualifiedType(x));
-  EXPECT_TRUE(Cpp::IsRestrictQualifiedType(y));
+  EXPECT_FALSE(Cpp::IsRestrictType(x));
+  EXPECT_TRUE(Cpp::IsRestrictType(y));
 
-  EXPECT_FALSE(Cpp::GetNonRestrictQualifiedType(x));
-  EXPECT_EQ(Cpp::GetCanonicalType(Cpp::GetNonRestrictQualifiedType(y)),
+  EXPECT_EQ(Cpp::GetCanonicalType(Cpp::GetNonRestrictType(y)),
+            Cpp::GetCanonicalType(x));
+  EXPECT_EQ(Cpp::GetCanonicalType(Cpp::GetNonRestrictType(x)),
             Cpp::GetCanonicalType(x));
 }