Skip to content

Commit 31c773f

Browse files
committed
Fix windows build failures.
unsigned long is 32 bits on MSVC
1 parent 3527a02 commit 31c773f

File tree

1 file changed

+26
-26
lines changed

1 file changed

+26
-26
lines changed

clang/include/clang/AST/Stmt.h

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ class alignas(void *) Stmt {
140140

141141
/// The location of the semi-colon.Add commentMore actions
142142
LLVM_PREFERRED_TYPE(SourceLocation)
143-
unsigned long SemiLoc : SourceLocation::Bits;
143+
uint64_t SemiLoc : SourceLocation::Bits;
144144
};
145145

146146
class CompoundStmtBitfields {
@@ -165,7 +165,7 @@ class alignas(void *) Stmt {
165165
unsigned : NumStmtBits;
166166

167167
LLVM_PREFERRED_TYPE(SourceLocation)
168-
unsigned long IdentLoc : SourceLocation::Bits;
168+
uint64_t IdentLoc : SourceLocation::Bits;
169169
};
170170

171171
class AttributedStmtBitfields {
@@ -204,7 +204,7 @@ class alignas(void *) Stmt {
204204

205205
/// The location of the "if"
206206
LLVM_PREFERRED_TYPE(SourceLocation)
207-
unsigned long IfLoc : SourceLocation::Bits;
207+
uint64_t IfLoc : SourceLocation::Bits;
208208
};
209209

210210
class SwitchStmtBitfields {
@@ -229,7 +229,7 @@ class alignas(void *) Stmt {
229229

230230
/// The location of the "switch".
231231
LLVM_PREFERRED_TYPE(SourceLocation)
232-
unsigned long SwitchLoc : SourceLocation::Bits;
232+
uint64_t SwitchLoc : SourceLocation::Bits;
233233
};
234234

235235
class WhileStmtBitfields {
@@ -245,7 +245,7 @@ class alignas(void *) Stmt {
245245

246246
/// The location of the "while"
247247
LLVM_PREFERRED_TYPE(SourceLocation)
248-
unsigned long WhileLoc : SourceLocation::Bits;
248+
uint64_t WhileLoc : SourceLocation::Bits;
249249
};
250250

251251
class DoStmtBitfields {
@@ -256,7 +256,7 @@ class alignas(void *) Stmt {
256256

257257
/// The location of the "do"
258258
LLVM_PREFERRED_TYPE(SourceLocation)
259-
unsigned long DoLoc : SourceLocation::Bits;
259+
uint64_t DoLoc : SourceLocation::Bits;
260260
};
261261

262262
class ForStmtBitfields {
@@ -267,7 +267,7 @@ class alignas(void *) Stmt {
267267

268268
/// The location of the "for"
269269
LLVM_PREFERRED_TYPE(SourceLocation)
270-
unsigned long ForLoc : SourceLocation::Bits;
270+
uint64_t ForLoc : SourceLocation::Bits;
271271
};
272272

273273
class GotoStmtBitfields {
@@ -279,7 +279,7 @@ class alignas(void *) Stmt {
279279

280280
/// The location of the "goto"
281281
LLVM_PREFERRED_TYPE(SourceLocation)
282-
unsigned long GotoLoc : SourceLocation::Bits;
282+
uint64_t GotoLoc : SourceLocation::Bits;
283283
};
284284

285285
class ContinueStmtBitfields {
@@ -290,7 +290,7 @@ class alignas(void *) Stmt {
290290

291291
/// The location of the "continue"
292292
LLVM_PREFERRED_TYPE(SourceLocation)
293-
unsigned long ContinueLoc : SourceLocation::Bits;
293+
uint64_t ContinueLoc : SourceLocation::Bits;
294294
};
295295

296296
class BreakStmtBitfields {
@@ -301,7 +301,7 @@ class alignas(void *) Stmt {
301301

302302
/// The location of the "break"
303303
LLVM_PREFERRED_TYPE(SourceLocation)
304-
unsigned long BreakLoc : SourceLocation::Bits;
304+
uint64_t BreakLoc : SourceLocation::Bits;
305305
};
306306

307307
class ReturnStmtBitfields {
@@ -316,7 +316,7 @@ class alignas(void *) Stmt {
316316

317317
/// The location of the "return"
318318
LLVM_PREFERRED_TYPE(SourceLocation)
319-
unsigned long RetLoc : SourceLocation::Bits;
319+
uint64_t RetLoc : SourceLocation::Bits;
320320
};
321321

322322
class SwitchCaseBitfields {
@@ -333,7 +333,7 @@ class alignas(void *) Stmt {
333333

334334
/// The location of the "case" or "default" keyword.
335335
LLVM_PREFERRED_TYPE(SourceLocation)
336-
unsigned long KeywordLoc : SourceLocation::Bits;
336+
uint64_t KeywordLoc : SourceLocation::Bits;
337337
};
338338

339339
//===--- Expression bitfields classes ---===//
@@ -550,7 +550,7 @@ class alignas(void *) Stmt {
550550
unsigned : NumExprBits;
551551

552552
LLVM_PREFERRED_TYPE(SourceLocation)
553-
unsigned long RBracketLoc : SourceLocation::Bits;
553+
uint64_t RBracketLoc : SourceLocation::Bits;
554554
};
555555

556556
class CallExprBitfields {
@@ -705,7 +705,7 @@ class alignas(void *) Stmt {
705705

706706
/// The location of the "_Generic"
707707
LLVM_PREFERRED_TYPE(SourceLocation)
708-
unsigned long GenericLoc : SourceLocation::Bits;
708+
uint64_t GenericLoc : SourceLocation::Bits;
709709
};
710710

711711
class PseudoObjectExprBitfields {
@@ -815,7 +815,7 @@ class alignas(void *) Stmt {
815815

816816
/// The location of the boolean ligeral
817817
LLVM_PREFERRED_TYPE(SourceLocation)
818-
unsigned long Loc : SourceLocation::Bits;
818+
uint64_t Loc : SourceLocation::Bits;
819819
};
820820

821821
class CXXNullPtrLiteralExprBitfields {
@@ -826,7 +826,7 @@ class alignas(void *) Stmt {
826826

827827
/// The location of the null pointer literal.
828828
LLVM_PREFERRED_TYPE(SourceLocation)
829-
unsigned long Loc : SourceLocation::Bits;
829+
uint64_t Loc : SourceLocation::Bits;
830830
};
831831

832832
class CXXThisExprBitfields {
@@ -846,7 +846,7 @@ class alignas(void *) Stmt {
846846

847847
/// The location of the "this"
848848
LLVM_PREFERRED_TYPE(SourceLocation)
849-
unsigned long Loc : SourceLocation::Bits;
849+
uint64_t Loc : SourceLocation::Bits;
850850
};
851851

852852
class CXXThrowExprBitfields {
@@ -862,7 +862,7 @@ class alignas(void *) Stmt {
862862

863863
/// The location of the "throw"
864864
LLVM_PREFERRED_TYPE(SourceLocation)
865-
unsigned long ThrowLoc : SourceLocation::Bits;
865+
uint64_t ThrowLoc : SourceLocation::Bits;
866866
};
867867

868868
class CXXDefaultArgExprBitfields {
@@ -878,7 +878,7 @@ class alignas(void *) Stmt {
878878

879879
/// The location where the default argument expression was used.
880880
LLVM_PREFERRED_TYPE(SourceLocation)
881-
unsigned long Loc : SourceLocation::Bits;
881+
uint64_t Loc : SourceLocation::Bits;
882882
};
883883

884884
class CXXDefaultInitExprBitfields {
@@ -895,7 +895,7 @@ class alignas(void *) Stmt {
895895

896896
/// The location where the default initializer expression was used.
897897
LLVM_PREFERRED_TYPE(SourceLocation)
898-
unsigned long Loc : SourceLocation::Bits;
898+
uint64_t Loc : SourceLocation::Bits;
899899
};
900900

901901
class CXXScalarValueInitExprBitfields {
@@ -907,7 +907,7 @@ class alignas(void *) Stmt {
907907

908908
/// The location where the default initializer expression was used.
909909
LLVM_PREFERRED_TYPE(SourceLocation)
910-
unsigned long RParenLoc : SourceLocation::Bits;
910+
uint64_t RParenLoc : SourceLocation::Bits;
911911
};
912912

913913
class CXXNewExprBitfields {
@@ -984,7 +984,7 @@ class alignas(void *) Stmt {
984984

985985
/// Location of the expression
986986
LLVM_PREFERRED_TYPE(SourceLocation)
987-
unsigned long Loc : SourceLocation::Bits;
987+
uint64_t Loc : SourceLocation::Bits;
988988
};
989989

990990
class TypeTraitExprBitfields {
@@ -1100,7 +1100,7 @@ class alignas(void *) Stmt {
11001100

11011101
/// The location of the '->' or '.' operator.
11021102
LLVM_PREFERRED_TYPE(SourceLocation)
1103-
unsigned long OperatorLoc : SourceLocation::Bits;
1103+
uint64_t OperatorLoc : SourceLocation::Bits;
11041104
};
11051105

11061106
class OverloadExprBitfields {
@@ -1181,7 +1181,7 @@ class alignas(void *) Stmt {
11811181

11821182
/// The location of the non-type template parameter reference.
11831183
LLVM_PREFERRED_TYPE(SourceLocation)
1184-
unsigned long NameLoc : SourceLocation::Bits;
1184+
uint64_t NameLoc : SourceLocation::Bits;
11851185
};
11861186

11871187
class LambdaExprBitfields {
@@ -1222,7 +1222,7 @@ class alignas(void *) Stmt {
12221222
unsigned IsSatisfied : 1;
12231223

12241224
LLVM_PREFERRED_TYPE(SourceLocation)
1225-
unsigned long RequiresKWLoc : SourceLocation::Bits;
1225+
uint64_t RequiresKWLoc : SourceLocation::Bits;
12261226
};
12271227

12281228
class ArrayTypeTraitExprBitfields {
@@ -1316,7 +1316,7 @@ class alignas(void *) Stmt {
13161316

13171317
/// The location of the non-type template parameter reference.
13181318
LLVM_PREFERRED_TYPE(SourceLocation)
1319-
unsigned long Loc : SourceLocation::Bits;
1319+
uint64_t Loc : SourceLocation::Bits;
13201320
};
13211321

13221322
class ConvertVectorExprBitfields {

0 commit comments

Comments
 (0)