llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-clang Author: Ilya Biryukov (ilya-biryukov) <details> <summary>Changes</summary> `createExpansionLocImpl` has an assert that checks if we ran out of source locations. We have observed this happening on real code and in release builds the assertion does not fire and the compiler just keeps running indefinitely without giving any indication that something went wrong. Diagnose this problem and reliably crash to make sure the problem is easy to detect. I have also tried: - returning invalid source locations, - reporting sloc address space usage on error. Both caused the compiler to run indefinitely. It would be nice to dig further why that happens, but until then crashing seems like a better alternative. --- Full diff: https://github.com/llvm/llvm-project/pull/69908.diff 2 Files Affected: - (modified) clang/include/clang/Basic/DiagnosticCommonKinds.td (+2) - (modified) clang/lib/Basic/SourceManager.cpp (+7-4) ``````````diff diff --git a/clang/include/clang/Basic/DiagnosticCommonKinds.td b/clang/include/clang/Basic/DiagnosticCommonKinds.td index f2df283c74829f6..080748a73571690 100644 --- a/clang/include/clang/Basic/DiagnosticCommonKinds.td +++ b/clang/include/clang/Basic/DiagnosticCommonKinds.td @@ -356,6 +356,8 @@ def err_file_modified : Error< "file '%0' modified since it was first processed">, DefaultFatal; def err_file_too_large : Error< "sorry, unsupported: file '%0' is too large for Clang to process">; +def err_expansions_too_large : Error< + "sorry, the translation unit is too large: ran out of source locations while processing a macro expansion">, DefaultFatal; def err_include_too_large : Error< "sorry, this include generates a translation unit too large for" " Clang to process.">, DefaultFatal; diff --git a/clang/lib/Basic/SourceManager.cpp b/clang/lib/Basic/SourceManager.cpp index c44ecacb3de3a10..dcf18c47cbaf9ae 100644 --- a/clang/lib/Basic/SourceManager.cpp +++ b/clang/lib/Basic/SourceManager.cpp @@ -663,10 +663,13 @@ SourceManager::createExpansionLocImpl(const ExpansionInfo &Info, return SourceLocation::getMacroLoc(LoadedOffset); } LocalSLocEntryTable.push_back(SLocEntry::get(NextLocalOffset, Info)); - // FIXME: Produce a proper diagnostic for this case. - assert(NextLocalOffset + Length + 1 > NextLocalOffset && - NextLocalOffset + Length + 1 <= CurrentLoadedOffset && - "Ran out of source locations!"); + if (NextLocalOffset + Length + 1 <= NextLocalOffset || + NextLocalOffset + Length + 1 > CurrentLoadedOffset) { + Diag.Report(Info.getExpansionLocStart(), diag::err_expansions_too_large); + Diag.Report(Info.getExpansionLocStart(), diag::remark_sloc_usage); + noteSLocAddressSpaceUsage(Diag); + return SourceLocation(); + } // See createFileID for that +1. NextLocalOffset += Length + 1; return SourceLocation::getMacroLoc(NextLocalOffset - (Length + 1)); `````````` </details> https://github.com/llvm/llvm-project/pull/69908 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits