Make buildItypeDecl use the internal PVConstraint (proof of concept)

mattmccutchen-cci · mattmccutchen-cci · commit c88e27577eb6 · 2021-09-09T18:28:23.000-04:00
diff --git a/clang/include/clang/3C/DeclRewriter.h b/clang/include/clang/3C/DeclRewriter.h
@@ -35,7 +35,7 @@ class DeclRewriter {
   static void rewriteDecls(ASTContext &Context, ProgramInfo &Info, Rewriter &R);
 
   static void
-  buildItypeDecl(PVConstraint *Defn, DeclaratorDecl *Decl, std::string &Type,
+  buildItypeDecl(PVConstraint *Int, PVConstraint *Ext, DeclaratorDecl *Decl, std::string &Type,
                  std::string &IType, ProgramInfo &Info,
                  ArrayBoundsRewriter &ABR);
 
@@ -111,7 +111,7 @@ class FunctionDeclBuilder : public RecursiveASTVisitor<FunctionDeclBuilder> {
                         std::string &Type, std::string &IType,
                         std::string UseName, bool &RewriteParm,
                         bool &RewriteRet);
-  void buildItypeDecl(PVConstraint *Defn, DeclaratorDecl *Decl,
+  void buildItypeDecl(PVConstraint *Int, PVConstraint *Ext, DeclaratorDecl *Decl,
                       std::string &Type, std::string &IType, bool &RewriteParm,
                       bool &RewriteRet);
 
diff --git a/clang/lib/3C/DeclRewriter.cpp b/clang/lib/3C/DeclRewriter.cpp
@@ -32,9 +32,10 @@ using namespace clang;
 // is the taken from the constraint graph solution. The unchecked portion is
 // assigned to string reference Type and the checked (itype) portion is assigned
 // to the string reference Itype.
-void DeclRewriter::buildItypeDecl(PVConstraint *Defn, DeclaratorDecl *Decl,
+void DeclRewriter::buildItypeDecl(PVConstraint *Int, PVConstraint *Ext, DeclaratorDecl *Decl,
                                   std::string &Type, std::string &IType,
                                   ProgramInfo &Info, ArrayBoundsRewriter &ABR) {
+  PVConstraint *Defn = Ext;
   const EnvironmentMap &Env = Info.getConstraints().getVariables();
   // True when the type of this variable is defined by a typedef, and the
   // constraint variable representing the typedef solved to an unchecked type.
@@ -54,18 +55,20 @@ void DeclRewriter::buildItypeDecl(PVConstraint *Defn, DeclaratorDecl *Decl,
   // unchecked portion of the itype. The typedef is used directly in the checked
   // portion of the itype.
   bool IsCheckedTypedef = Defn->isTypedef() && !IsUncheckedTypedef;
-  if (IsCheckedTypedef || Defn->getFV()) {
+  if (IsCheckedTypedef || Defn->getFV() || true /*test*/) {
     // Generate the type string from PVC if we need to unmask a typedef, this is
     // a function pointer, or this is a constant size array. When unmasking a
     // typedef, the expansion of the typedef does not exist in the original
     // source, so it must be constructed. For function pointers, a function
     // pointer appearing in the unchecked portion of an itype must contain an
     // extra set of parenthesis (e.g. `void ((*f)())` instead of `void (f*)()`)
     // for the declaration to parse correctly.
-    Type = Defn->mkString(Info.getConstraints(),
+    Type = (Int ? Int : Ext)->mkString(Info.getConstraints(),
                           MKSTRING_OPTS(UnmaskTypedef = IsCheckedTypedef,
-                                        ForItypeBase = true));
-  } else {
+                                        ForItypeBase = !Int));
+  }
+#if 0
+  else {
     // In the remaining cases, the unchecked portion of the itype is just the
     // original type of the pointer. The first branch tries to generate the type
     // using the type and name for this specific declaration. This is important
@@ -84,6 +87,7 @@ void DeclRewriter::buildItypeDecl(PVConstraint *Defn, DeclaratorDecl *Decl,
       Type += " ";
     }
   }
+#endif
 
   IType = " : itype(";
   IType += Defn->mkString(Info.getConstraints(),
@@ -204,7 +208,7 @@ void DeclRewriter::rewriteDecls(ASTContext &Context, ProgramInfo &Info,
           std::string Type, IType;
           // VarDecl and FieldDecl subclass DeclaratorDecl, so the cast will
           // always succeed.
-          DeclRewriter::buildItypeDecl(PV, cast<DeclaratorDecl>(D), Type, IType,
+          DeclRewriter::buildItypeDecl(nullptr, PV, cast<DeclaratorDecl>(D), Type, IType,
                                        Info, ABRewriter);
           NewTy += Type + IType;
         } else {
@@ -780,12 +784,12 @@ void FunctionDeclBuilder::buildCheckedDecl(
 }
 
 
-void FunctionDeclBuilder::buildItypeDecl(PVConstraint *Defn,
+void FunctionDeclBuilder::buildItypeDecl(PVConstraint *Int, PVConstraint *Ext,
                                          DeclaratorDecl *Decl,
                                          std::string &Type, std::string &IType,
                                          bool &RewriteParm, bool &RewriteRet) {
   Info.getPerfStats().incrementNumITypes();
-  DeclRewriter::buildItypeDecl(Defn, Decl, Type, IType, Info, ABRewriter);
+  DeclRewriter::buildItypeDecl(Int, Ext, Decl, Type, IType, Info, ABRewriter);
   RewriteParm = true;
   RewriteRet |= isa_and_nonnull<FunctionDecl>(Decl);
 }
@@ -804,7 +808,7 @@ void FunctionDeclBuilder::buildDeclVar(const FVComponentVariable *CV,
   bool ItypeSolution = CV->hasItypeSolution(Info.getConstraints());
   if (ItypeSolution ||
       (CheckedSolution && _3COpts.ItypesForExtern && !StaticFunc)) {
-    buildItypeDecl(CV->getExternal(), Decl, Type, IType, RewriteParm,
+    buildItypeDecl(CV->getInternal(), CV->getExternal(), Decl, Type, IType, RewriteParm,
                    RewriteRet);
     return;
   }
