Revert the presumed location change from the

preprocess-before-conversion branch.

It's no longer needed with the current expand-macros approach and would
need a new regression test, which I don't want to deal with now. Plus,
in its current form, it seems to have a semantic conflict with #488,
which might fix the icecast file path issue.

Author: mattmccutchen-cci

clang/lib/3C/PersistentSourceLoc.cpp

@@ -61,11 +61,7 @@ PersistentSourceLoc PersistentSourceLoc::mkPSL(clang::SourceRange SR,
     }
   }
   std::string Fn = PL.getFilename();
-  std::string Tmp;
-  getCanonicalFilePath(Fn, Tmp);
-  Fn = Tmp;
 
-#if 0
   // Get the absolute filename of the file.
   FullSourceLoc TFSL(SR.getBegin(), SM);
   if (TFSL.isValid()) {
@@ -81,8 +77,7 @@ PersistentSourceLoc PersistentSourceLoc::mkPSL(clang::SourceRange SR,
     }
     Fn = std::string(sys::path::remove_leading_dotslash(FeAbsS));
   }
-#endif
-  PersistentSourceLoc PSL(Fn, PL.getLine() /*FESL.getExpansionLineNumber()*/,
+  PersistentSourceLoc PSL(Fn, FESL.getExpansionLineNumber(),
                           FESL.getExpansionColumnNumber(), EndCol);
 
   return PSL;

clang/test/3C/base_subdir/canwrite_constraints_symlink.c

@@ -30,5 +30,5 @@
 // expected-note@*:* {{-dump-unwritable-changes}}
 // expected-note@*:* {{-allow-unwritable-changes}}
 
-void foo()
+void
 #include "base_subdir_partial_defn.h"

clang/test/3C/base_subdir/canwrite_constraints_unimplemented.c

@@ -30,13 +30,16 @@
 // the latter in order to keep all the "weird" stuff in this test file and leave
 // canwrite_constraints.c sane.
 
-// Since the declaration of foo begins in this (writable) file, -addcr currently
-// assumes the whole body is writable and tries to insert an _Unchecked
-// annotation on the inner block in ../base_subdir_partial_defn.h.
+// Since the declaration of foo begins with the "void" in this (writable) file,
+// 3C currently assumes the whole declaration is writable. Then 3C rewrites the
+// declaration of the parameter "x", which is wholly within
+// ../base_subdir_partial_defn.h; the rewriter seems to handle this with no
+// trouble. But then the proposed change to an unwritable file trips the error
+// we are testing.
 //
 // Changing 3C to handle such contrived preprocessor nonsense correctly is a low
 // priority, so this test hopefully won't have to be changed for a while, if
 // ever.
 
-void foo()
+void
 #include "../base_subdir_partial_defn.h"

clang/test/3C/base_subdir_partial_defn.h

@@ -7,11 +7,6 @@
 // base_subdir (see
 // https://github.com/correctcomputation/checkedc-clang/issues/327).
 
-// This incomplete function definition is intentional. The rest is in the file
+// The lack of a return type here is intentional. The return type is in the file
 // that includes base_subdir_partial_defn.h.
-
-{
-  {
-    int *x = (int *)1;
-  }
-}
+foo(int *x) {}

clang/test/3C/stdout_mode_write_other.c

@@ -20,5 +20,5 @@
 // expected-note@*:* {{-dump-unwritable-changes}}
 // expected-note@*:* {{-allow-unwritable-changes}}
 
-void foo()
+void
 #include "base_subdir_partial_defn.h"