@@ -216,7 +216,7 @@ void DataLayout::reset(StringRef Desc) {
216216 if (Error Err = setPointerAlignmentInBits (0 , Align (8 ), Align (8 ), 64 , 64 ))
217217 return report_fatal_error (std::move (Err));
218218
219- setNullPointerValue (INT_MAX, 0 );
219+ setDefaultNullPointerValue (INT_MAX, 0 );
220220
221221 if (Error Err = parseSpecifier (Desc))
222222 return report_fatal_error (std::move (Err));
@@ -262,11 +262,11 @@ static Error getIntForAddrSpace(StringRef R, IntTy &Result) {
262262 if (error || Result <= 0 )
263263 return reportError (" not a number, or does not fit in an unsigned int" );
264264 Result *= -1 ;
265- return Error::success ();
266265 } else if (R.contains (" neg" ))
267266 return reportError (" not a valid value for address space" );
268267 else
269268 return getInt<IntTy>(R, Result);
269+ return Error::success ();
270270}
271271
272272// / Get an unsigned integer representing the number of bits and convert it into
@@ -527,7 +527,7 @@ Error DataLayout::parseSpecifier(StringRef Desc) {
527527 if (Tok.empty ()) {
528528 if (Error Err = getIntForAddrSpace (Rest, Value))
529529 return Err;
530- setNullPointerValue (INT_MAX, Value);
530+ setDefaultNullPointerValue (INT_MAX, Value);
531531 break ;
532532 } else {
533533 if (Error Err = getInt (Tok, AddrSpace))
@@ -543,7 +543,7 @@ Error DataLayout::parseSpecifier(StringRef Desc) {
543543 return Err;
544544 if (Error Err = getIntForAddrSpace (Tok, Value))
545545 return Err;
546- setNullPointerValue (AddrSpace, Value);
546+ setDefaultNullPointerValue (AddrSpace, Value);
547547 break ;
548548 }
549549 case ' G' : { // Default address space for global variables.
0 commit comments