diff --git a/clang/lib/Basic/Diagnostic.cpp b/clang/lib/Basic/Diagnostic.cpp index 7a54d27ef9d8ee2d407109606c644feca7b9cdf9..8fcbc717b7f475df5a28e4af811eb0e0cc2a3add 100644 --- a/clang/lib/Basic/Diagnostic.cpp +++ b/clang/lib/Basic/Diagnostic.cpp @@ -355,21 +355,33 @@ void DiagnosticsEngine::setSeverity(diag::kind Diag, diag::Severity Map, SourceLocation L) { assert(Diag < diag::DIAG_UPPER_LIMIT && "Can only map builtin diagnostics"); +#ifdef BUILD_FOR_OPENEULER + if (!(DiagOpts->GccCompatible)) { +#endif assert((Diags->isBuiltinWarningOrExtension(Diag) || (Map == diag::Severity::Fatal || Map == diag::Severity::Error)) && "Cannot map errors into warnings!"); +#ifdef BUILD_FOR_OPENEULER + } +#endif assert((L.isInvalid() || SourceMgr) && "No SourceMgr for valid location"); // Don't allow a mapping to a warning override an error/fatal mapping. bool WasUpgradedFromWarning = false; - if (Map == diag::Severity::Warning) { - DiagnosticMapping &Info = GetCurDiagState()->getOrAddMapping(Diag); - if (Info.getSeverity() == diag::Severity::Error || - Info.getSeverity() == diag::Severity::Fatal) { - Map = Info.getSeverity(); - WasUpgradedFromWarning = true; +#ifdef BUILD_FOR_OPENEULER + if (!(DiagOpts->GccCompatible)) { +#endif + if (Map == diag::Severity::Warning) { + DiagnosticMapping &Info = GetCurDiagState()->getOrAddMapping(Diag); + if (Info.getSeverity() == diag::Severity::Error || + Info.getSeverity() == diag::Severity::Fatal) { + Map = Info.getSeverity(); + WasUpgradedFromWarning = true; + } } +#ifdef BUILD_FOR_OPENEULER } +#endif DiagnosticMapping Mapping = makeUserMapping(Map, L); Mapping.setUpgradedFromWarning(WasUpgradedFromWarning); diff --git a/clang/lib/Frontend/FrontendAction.cpp b/clang/lib/Frontend/FrontendAction.cpp index 0bd4b01ff79dbbf475697609b688144577f54456..b284b07507c8f8877bf0c149a38de63d5b3fad11 100644 --- a/clang/lib/Frontend/FrontendAction.cpp +++ b/clang/lib/Frontend/FrontendAction.cpp @@ -31,6 +31,7 @@ #include "clang/Parse/ParseAST.h" #include "clang/Sema/HLSLExternalSemaSource.h" #include "clang/Sema/MultiplexExternalSemaSource.h" +#include "clang/Sema/SemaDiagnostic.h" #include "clang/Serialization/ASTDeserializationListener.h" #include "clang/Serialization/ASTReader.h" #include "clang/Serialization/GlobalModuleIndex.h" @@ -1170,6 +1171,14 @@ void ASTFrontendAction::ExecuteAction() { if (!CI.hasSema()) CI.createSema(getTranslationUnitKind(), CompletionConsumer); +#ifdef BUILD_FOR_OPENEULER + if (CI.getLangOpts().GccCompatible) { + // error: first parameter of 'main' (argument count) must be of type 'int' + CI.getSema().Diags.setSeverity(diag::err_main_arg_wrong, + diag::Severity::Warning, {}); + } +#endif + ParseAST(CI.getSema(), CI.getFrontendOpts().ShowStats, CI.getFrontendOpts().SkipFunctionBodies); } diff --git a/clang/test/Driver/test-error-compatibility.cpp b/clang/test/Driver/test-error-compatibility.cpp new file mode 100644 index 0000000000000000000000000000000000000000..82854173edd4b3a53f09d61599f52c4e8fdd4f68 --- /dev/null +++ b/clang/test/Driver/test-error-compatibility.cpp @@ -0,0 +1,7 @@ +// REQUIRES: build_for_openeuler +// RUN: %clang -fgcc-compatible -c %s 2>&1 | FileCheck -check-prefix=CHECK-error %s +// RUN: not %clang -c %s 2>&1 | FileCheck -check-prefix=CHECK-error %s +// CHECK-error: first parameter of 'main' (argument count) must be of type 'int' +int main(char* argv[]) +{ +}