Merge branch 'main' of github.com:correctcomputation/checkedc-clang

Author: mattmccutchen-cci

clang/include/clang/3C/3C.h

@@ -104,7 +104,10 @@ class _3CInterface {
          const std::vector<std::string> &SourceFileList,
          clang::tooling::CompilationDatabase *CompDB);
 
-  // Constraint Building.
+  // Call clang to provide the data
+  bool parseASTs();
+
+  // Constraints
 
   // Create ConstraintVariables to hold constraints
   bool addVariables();
@@ -134,14 +137,15 @@ class _3CInterface {
   // Write all converted versions of the files in the source file list
   // to disk
   bool writeAllConvertedFilesToDisk();
-  // Write the current converted state of the provided file.
-  bool writeConvertedFileToDisk(const std::string &FilePath);
 
 private:
   _3CInterface(const struct _3COptions &CCopt,
                const std::vector<std::string> &SourceFileList,
                clang::tooling::CompilationDatabase *CompDB, bool &Failed);
 
+  // saved ASTs
+  std::vector< std::unique_ptr< ASTUnit >> ASTs;
+
   // Are constraints already built?
   bool ConstraintsBuilt;
   void invalidateAllConstraintsWithReason(Constraint *ConstraintToRemove);

clang/include/clang/3C/ConstraintVariables.h

@@ -84,7 +84,7 @@ class ConstraintVariable {
   // the name of the variable, false for just the type.
   // The 'forIType' parameter is true when the generated string is expected
   // to be used inside an itype.
-  virtual std::string mkString(const EnvironmentMap &E, bool EmitName = true,
+  virtual std::string mkString(Constraints &CS, bool EmitName = true,
                                bool ForItype = false, bool EmitPointee = false,
                                bool UnmaskTypedef = false) const = 0;
 
@@ -399,7 +399,7 @@ class PointerVariableConstraint : public ConstraintVariable {
 
   std::string gatherQualStrings(void) const;
 
-  std::string mkString(const EnvironmentMap &E, bool EmitName = true,
+  std::string mkString(Constraints &CS, bool EmitName = true,
                        bool ForItype = false, bool EmitPointee = false,
                        bool UnmaskTypedef = false) const override;
 
@@ -470,9 +470,15 @@ class FVComponentVariable {
 
   void mergeDeclaration(FVComponentVariable *From, ProgramInfo &I,
                         std::string &ReasonFailed);
-  std::string mkItypeStr(const EnvironmentMap &E) const;
-  std::string mkTypeStr(const EnvironmentMap &E, bool EmitName) const;
-  std::string mkString(const EnvironmentMap &E) const;
+  std::string mkItypeStr(Constraints &CS) const;
+  std::string mkTypeStr(Constraints &CS, bool EmitName) const;
+  std::string mkString(Constraints &CS) const;
+
+  bool hasItypeSolution(Constraints &CS) const;
+  bool hasCheckedSolution(Constraints &CS) const;
+
+  PVConstraint *getInternal() const { return InternalConstraint; }
+  PVConstraint *getExternal() const { return ExternalConstraint; }
 };
 
 // Constraints on a function type. Also contains a 'name' parameter for
@@ -524,6 +530,10 @@ class FunctionVariableConstraint : public ConstraintVariable {
     return ReturnVar.InternalConstraint;
   }
 
+  const FVComponentVariable *getCombineReturn() const {
+    return &ReturnVar;
+  }
+
   size_t numParams() const { return ParamVars.size(); }
 
   bool hasProtoType() const { return Hasproto; }
@@ -548,6 +558,11 @@ class FunctionVariableConstraint : public ConstraintVariable {
     return ParamVars.at(I).InternalConstraint;
   }
 
+  const FVComponentVariable *getCombineParam(unsigned I) const {
+    assert(I < ParamVars.size());
+    return &ParamVars.at(I);
+  }
+
   bool srcHasItype() const override;
   bool srcHasBounds() const override;
 
@@ -558,7 +573,7 @@ class FunctionVariableConstraint : public ConstraintVariable {
   bool solutionEqualTo(Constraints &CS, const ConstraintVariable *CV,
                        bool ComparePtyp = true) const override;
 
-  std::string mkString(const EnvironmentMap &E, bool EmitName = true,
+  std::string mkString(Constraints &CS, bool EmitName = true,
                        bool ForItype = false, bool EmitPointee = false,
                        bool UnmaskTypedef = false) const override;
   void print(llvm::raw_ostream &O) const override;

clang/include/clang/3C/DeclRewriter.h

@@ -112,7 +112,7 @@ class FunctionDeclBuilder : public RecursiveASTVisitor<FunctionDeclBuilder> {
   // Get existing itype string from constraint variables.
   std::string getExistingIType(ConstraintVariable *DeclC);
 
-  virtual void buildDeclVar(PVConstraint *IntCV, PVConstraint *ExtCV,
+  virtual void buildDeclVar(const FVComponentVariable *CV,
                             DeclaratorDecl *Decl, std::string &Type,
                             std::string &IType, bool &RewriteParm,
                             bool &RewriteRet);

clang/include/clang/3C/Utils.h

@@ -104,18 +104,12 @@ bool hasFunctionBody(clang::Decl *D);
 
 std::string getStorageQualifierString(clang::Decl *D);
 
-// Use this version for user input that has not yet been validated.
 std::error_code tryGetCanonicalFilePath(const std::string &FileName,
                                         std::string &AbsoluteFp);
 
-// This version asserts success. It may be used for convenience for files we are
-// already accessing and thus believe should exist, modulo race conditions and
-// the like.
-void getCanonicalFilePath(const std::string &FileName, std::string &AbsoluteFp);
-
 // This compares entire path components: it's smart enough to know that "foo.c"
 // does not start with "foo". It's not smart about anything else, so you should
-// probably put both paths through getCanonicalFilePath first.
+// probably put both paths through tryGetCanonicalFilePath first.
 bool filePathStartsWith(const std::string &Path, const std::string &Prefix);
 
 bool isNULLExpression(clang::Expr *E, clang::ASTContext &C);
@@ -169,8 +163,8 @@ bool isCastSafe(clang::QualType DstType, clang::QualType SrcType);
 // Check if the provided file path belongs to the input project
 // and can be rewritten.
 //
-// For accurate results, the path must have gone through getCanonicalFilePath.
-// Note that the file name of a PersistentSourceLoc is always canonical.
+// For accurate results, the path must be canonical. The file name of a
+// PersistentSourceLoc can normally be assumed to be canonical.
 bool canWrite(const std::string &FilePath);
 
 // Check if the provided variable has void as one of its type.