@@ -216,7 +216,7 @@ void DataLayout::reset(StringRef Desc) {
216
216
if (Error Err = setPointerAlignmentInBits (0 , Align (8 ), Align (8 ), 64 , 64 ))
217
217
return report_fatal_error (std::move (Err));
218
218
219
- setNullPointerValue (INT_MAX, 0 );
219
+ setDefaultNullPointerValue (INT_MAX, 0 );
220
220
221
221
if (Error Err = parseSpecifier (Desc))
222
222
return report_fatal_error (std::move (Err));
@@ -262,11 +262,11 @@ static Error getIntForAddrSpace(StringRef R, IntTy &Result) {
262
262
if (error || Result <= 0 )
263
263
return reportError (" not a number, or does not fit in an unsigned int" );
264
264
Result *= -1 ;
265
- return Error::success ();
266
265
} else if (R.contains (" neg" ))
267
266
return reportError (" not a valid value for address space" );
268
267
else
269
268
return getInt<IntTy>(R, Result);
269
+ return Error::success ();
270
270
}
271
271
272
272
// / Get an unsigned integer representing the number of bits and convert it into
@@ -527,7 +527,7 @@ Error DataLayout::parseSpecifier(StringRef Desc) {
527
527
if (Tok.empty ()) {
528
528
if (Error Err = getIntForAddrSpace (Rest, Value))
529
529
return Err;
530
- setNullPointerValue (INT_MAX, Value);
530
+ setDefaultNullPointerValue (INT_MAX, Value);
531
531
break ;
532
532
} else {
533
533
if (Error Err = getInt (Tok, AddrSpace))
@@ -543,7 +543,7 @@ Error DataLayout::parseSpecifier(StringRef Desc) {
543
543
return Err;
544
544
if (Error Err = getIntForAddrSpace (Tok, Value))
545
545
return Err;
546
- setNullPointerValue (AddrSpace, Value);
546
+ setDefaultNullPointerValue (AddrSpace, Value);
547
547
break ;
548
548
}
549
549
case ' G' : { // Default address space for global variables.
0 commit comments