Merge pull request #28247 from gmittert/ShiftingBlame

swift-ci · web-flow · commit 3b507499074b · 2019-11-13T19:22:33.000-08:00
diff --git a/include/swift/AST/IndexSubset.h b/include/swift/AST/IndexSubset.h
@@ -93,7 +93,7 @@ class IndexSubset : public llvm::FoldingSetNode {
     for (auto i : indices.set_bits()) {
       unsigned bitWordIndex, offset;
       std::tie(bitWordIndex, offset) = getBitWordIndexAndOffset(i);
-      getBitWord(bitWordIndex) |= (1 << offset);
+      getBitWord(bitWordIndex) |= (1ull << offset);
     }
   }
 
@@ -181,7 +181,7 @@ class IndexSubset : public llvm::FoldingSetNode {
   bool contains(unsigned index) const {
     unsigned bitWordIndex, offset;
     std::tie(bitWordIndex, offset) = getBitWordIndexAndOffset(index);
-    return getBitWord(bitWordIndex) & (1 << offset);
+    return getBitWord(bitWordIndex) & (1ull << offset);
   }
 
   bool isEmpty() const {

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ class IndexSubset : public llvm::FoldingSetNode {`
`93`	`93`	`for (auto i : indices.set_bits()) {`
`94`	`94`	`unsigned bitWordIndex, offset;`
`95`	`95`	`std::tie(bitWordIndex, offset) = getBitWordIndexAndOffset(i);`
`96`		`- getBitWord(bitWordIndex) \|= (1 << offset);`
	`96`	`+ getBitWord(bitWordIndex) \|= (1ull << offset);`
`97`	`97`	`}`
`98`	`98`	`}`
`99`	`99`
`@@ -181,7 +181,7 @@ class IndexSubset : public llvm::FoldingSetNode {`
`181`	`181`	`bool contains(unsigned index) const {`
`182`	`182`	`unsigned bitWordIndex, offset;`
`183`	`183`	`std::tie(bitWordIndex, offset) = getBitWordIndexAndOffset(index);`
`184`		`- return getBitWord(bitWordIndex) & (1 << offset);`
	`184`	`+ return getBitWord(bitWordIndex) & (1ull << offset);`
`185`	`185`	`}`
`186`	`186`
`187`	`187`	`bool isEmpty() const {`