More cleanup

Author: hokein

clang/include/clang/AST/Stmt.h

@@ -809,7 +809,7 @@ class alignas(void *) Stmt {
     LLVM_PREFERRED_TYPE(bool)
     uint64_t Value : 1;
 
-    /// The location of the boolean ligeral
+    /// The location of the boolean ligeral.
     LLVM_PREFERRED_TYPE(SourceLocation)
     uint64_t Loc : SourceLocation::Bits;
   };
@@ -840,7 +840,7 @@ class alignas(void *) Stmt {
     LLVM_PREFERRED_TYPE(bool)
     uint64_t CapturedByCopyInLambdaWithExplicitObjectParameter : 1;
 
-    /// The location of the "this"
+    /// The location of the "this".
     LLVM_PREFERRED_TYPE(SourceLocation)
     uint64_t Loc : SourceLocation::Bits;
   };
@@ -856,7 +856,7 @@ class alignas(void *) Stmt {
     LLVM_PREFERRED_TYPE(bool)
     uint64_t IsThrownVariableInScope : 1;
 
-    /// The location of the "throw"
+    /// The location of the "throw".
     LLVM_PREFERRED_TYPE(SourceLocation)
     uint64_t ThrowLoc : SourceLocation::Bits;
   };
@@ -901,7 +901,6 @@ class alignas(void *) Stmt {
     LLVM_PREFERRED_TYPE(ExprBitfields)
     uint64_t : NumExprBits;
 
-    /// The location where the default initializer expression was used.
     LLVM_PREFERRED_TYPE(SourceLocation)
     uint64_t RParenLoc : SourceLocation::Bits;
   };
@@ -978,7 +977,7 @@ class alignas(void *) Stmt {
     LLVM_PREFERRED_TYPE(bool)
     uint64_t UsualArrayDeleteWantsSize : 1;
 
-    /// Location of the expression
+    /// Location of the expression.
     LLVM_PREFERRED_TYPE(SourceLocation)
     uint64_t Loc : SourceLocation::Bits;
   };
@@ -1308,7 +1307,6 @@ class alignas(void *) Stmt {
     LLVM_PREFERRED_TYPE(bool)
     uint64_t IsUnique : 1;
 
-    /// The location of the non-type template parameter reference.
     LLVM_PREFERRED_TYPE(SourceLocation)
     uint64_t Loc : SourceLocation::Bits;
   };
@@ -2182,7 +2180,7 @@ class ValueStmt : public Stmt {
 class LabelStmt : public ValueStmt {
   LabelDecl *TheDecl;
   Stmt *SubStmt;
-  bool SideEntry = false; // FIXME: could improve
+  bool SideEntry = false;
 
 public:
   /// Build a label statement.
@@ -2545,8 +2543,12 @@ class IfStmt final
 class SwitchStmt final : public Stmt,
                          private llvm::TrailingObjects<SwitchStmt, Stmt *> {
   friend TrailingObjects;
+
   /// Points to a linked list of case and default statements.
   SwitchCase *FirstCase = nullptr;
+  
+  SourceLocation LParenLoc;
+  SourceLocation RParenLoc;
 
   // SwitchStmt is followed by several trailing objects,
   // some of which optional. Note that it would be more convenient to
@@ -2567,8 +2569,6 @@ class SwitchStmt final : public Stmt,
   //    Always present.
   enum { InitOffset = 0, BodyOffsetFromCond = 1 };
   enum { NumMandatoryStmtPtr = 2 };
-  SourceLocation LParenLoc;
-  SourceLocation RParenLoc;
 
   unsigned numTrailingStatements() const {
     return NumMandatoryStmtPtr + hasInitStorage() + hasVarStorage();
@@ -2754,6 +2754,7 @@ class WhileStmt final : public Stmt,
   //
   enum { VarOffset = 0, BodyOffsetFromCond = 1 };
   enum { NumMandatoryStmtPtr = 2 };
+
   SourceLocation LParenLoc, RParenLoc;
 
   unsigned varOffset() const { return VarOffset; }
@@ -2877,6 +2878,7 @@ class DoStmt : public Stmt {
   Stmt *SubExprs[END_EXPR];
   SourceLocation WhileLoc;
   SourceLocation RParenLoc; // Location of final ')' in do stmt condition.
+
 public:
   DoStmt(Stmt *Body, Expr *Cond, SourceLocation DL, SourceLocation WL,
          SourceLocation RP)
@@ -3187,6 +3189,7 @@ class ReturnStmt final
     : public Stmt,
       private llvm::TrailingObjects<ReturnStmt, const VarDecl *> {
   friend TrailingObjects;
+
   /// The return expression.
   Stmt *RetExpr;
 

clang/include/clang/Basic/SourceLocation.h

@@ -71,6 +71,8 @@ class FileID {
   int getOpaqueValue() const { return ID; }
 };
 
+using FileIDAndOffset = std::pair<FileID, unsigned>;
+
 /// Encodes a location in the source. The SourceManager can decode this
 /// to get at the full include stack, line and column information.
 ///
@@ -224,7 +226,6 @@ inline bool operator<=(const SourceLocation &LHS, const SourceLocation &RHS) {
 inline bool operator>=(const SourceLocation &LHS, const SourceLocation &RHS) {
   return LHS.getRawEncoding() >= RHS.getRawEncoding();
 }
-using FileIDAndOffset = std::pair<FileID, unsigned>;
 
 /// A trivial tuple used to represent a source range.
 class SourceRange {

clang/include/clang/Serialization/ASTBitCodes.h

@@ -165,6 +165,8 @@ const unsigned int NUM_PREDEF_MACRO_IDS = 1;
 
 /// An ID number that refers to an ObjC selector in an AST file.
 using SelectorID = uint64_t;
+static_assert(sizeof(SelectorID) >= sizeof(SourceLocation::UIntTy),
+              "SelectorID is too small to hold the SourceLocation");
 
 /// The number of predefined selector IDs.
 const unsigned int NUM_PREDEF_SELECTOR_IDS = 1;

clang/include/clang/Serialization/SourceLocationEncoding.h

@@ -15,17 +15,20 @@
 // To achieve this, we need to encode the index of the module file into the
 // encoding of the source location. The encoding of the source location may be:
 //
-//      |-----------------------|-----------------------|
-//      |          A            |         B         | C |
+//      |---------------|---------------------------|
+//      |        A      |           B           | C |
 //
-//  * A: 32 bit. The index of the module file in the module manager + 1. The +1
+//  * A: 24 bit. The index of the module file in the module manager + 1. The +1
 //  here is necessary since we wish 0 stands for the current module file.
-//  * B: 31 bit. The offset of the source location to the module file containing
+//  * B: 39 bit. The offset of the source location to the module file containing
 //  it.
 //  * C: The macro bit. We rotate it to the lowest bit so that we can save some
 //  space in case the index of the module file is 0.
 //
+// Together, B and C form SourceLocation::Bits (40 bits total).
 //
+// Currently, only the lower 16 bits of A are used to store the module file
+// index, leaving the upper 8 bits of A unused (reserved for future use).
 //===----------------------------------------------------------------------===//
 
 #ifndef LLVM_CLANG_SERIALIZATION_SOURCELOCATIONENCODING_H
@@ -96,7 +99,7 @@ SourceLocationEncoding::decode(RawLocEncoding Encoded) {
     return {SourceLocation::getFromRawEncoding(decodeRaw(Encoded)),
             ModuleFileIndex};
 
-  Encoded &= llvm::maskTrailingOnes<RawLocEncoding>((SourceLocation::Bits));
+  Encoded &= llvm::maskTrailingOnes<RawLocEncoding>(SourceLocation::Bits);
   SourceLocation Loc = SourceLocation::getFromRawEncoding(decodeRaw(Encoded));
 
   return {Loc, ModuleFileIndex};