Skip to content

Commit 772bd8a

Browse files
yxsamliuyxsamliu
committed
Revert "[CUDA][HIP] Defer overloading resolution diagnostics for host device functions"
This reverts commit 7f1f89e. This reverts commit 40df06c.
1 parent ddd9575 commit 772bd8a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+257
-530
lines changed

‎clang-tools-extra/clangd/Diagnostics.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ namespace {
4343
const char *getDiagnosticCode(unsigned ID) {
4444
switch (ID) {
4545
#define DIAG(ENUM, CLASS, DEFAULT_MAPPING, DESC, GROPU, SFINAE, NOWERROR, \
46-
SHOWINSYSHEADER, DEFERRABLE, CATEGORY) \
46+
SHOWINSYSHEADER, CATEGORY) \
4747
case clang::diag::ENUM: \
4848
return #ENUM;
4949
#include "clang/Basic/DiagnosticASTKinds.inc"

‎clang/include/clang/Basic/Diagnostic.td

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ class TextSubstitution<string Text> {
4545
// diagnostics
4646
string Component = "";
4747
string CategoryName = "";
48-
bit Deferrable = 0;
4948
}
5049

5150
// Diagnostic Categories. These can be applied to groups or individual
@@ -84,7 +83,6 @@ class Diagnostic<string text, DiagClass DC, Severity defaultmapping> {
8483
bit AccessControl = 0;
8584
bit WarningNoWerror = 0;
8685
bit ShowInSystemHeader = 0;
87-
bit Deferrable = 0;
8886
Severity DefaultSeverity = defaultmapping;
8987
DiagGroup Group;
9088
string CategoryName = "";
@@ -108,14 +106,6 @@ class SuppressInSystemHeader {
108106
bit ShowInSystemHeader = 0;
109107
}
110108

111-
class Deferrable {
112-
bit Deferrable = 1;
113-
}
114-
115-
class NonDeferrable {
116-
bit Deferrable = 0;
117-
}
118-
119109
// FIXME: ExtWarn and Extension should also be SFINAEFailure by default.
120110
class Error<string str> : Diagnostic<str, CLASS_ERROR, SEV_Error>, SFINAEFailure {
121111
bit ShowInSystemHeader = 1;

‎clang/include/clang/Basic/DiagnosticAST.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace clang {
1515
namespace diag {
1616
enum {
1717
#define DIAG(ENUM, FLAGS, DEFAULT_MAPPING, DESC, GROUP, SFINAE, NOWERROR, \
18-
SHOWINSYSHEADER, DEFERRABLE, CATEGORY) \
18+
SHOWINSYSHEADER, CATEGORY) \
1919
ENUM,
2020
#define ASTSTART
2121
#include "clang/Basic/DiagnosticASTKinds.inc"

‎clang/include/clang/Basic/DiagnosticAnalysis.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace clang {
1515
namespace diag {
1616
enum {
1717
#define DIAG(ENUM, FLAGS, DEFAULT_MAPPING, DESC, GROUP, SFINAE, NOWERROR, \
18-
SHOWINSYSHEADER, DEFERRABLE, CATEGORY) \
18+
SHOWINSYSHEADER, CATEGORY) \
1919
ENUM,
2020
#define ANALYSISSTART
2121
#include "clang/Basic/DiagnosticAnalysisKinds.inc"

‎clang/include/clang/Basic/DiagnosticComment.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace clang {
1515
namespace diag {
1616
enum {
1717
#define DIAG(ENUM, FLAGS, DEFAULT_MAPPING, DESC, GROUP, SFINAE, NOWERROR, \
18-
SHOWINSYSHEADER, DEFERRABLE, CATEGORY) \
18+
SHOWINSYSHEADER, CATEGORY) \
1919
ENUM,
2020
#define COMMENTSTART
2121
#include "clang/Basic/DiagnosticCommentKinds.inc"

‎clang/include/clang/Basic/DiagnosticCrossTU.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace clang {
1515
namespace diag {
1616
enum {
1717
#define DIAG(ENUM, FLAGS, DEFAULT_MAPPING, DESC, GROUP, SFINAE, NOWERROR, \
18-
SHOWINSYSHEADER, DEFERRABLE, CATEGORY) \
18+
SHOWINSYSHEADER, CATEGORY) \
1919
ENUM,
2020
#define CROSSTUSTART
2121
#include "clang/Basic/DiagnosticCrossTUKinds.inc"

‎clang/include/clang/Basic/DiagnosticDriver.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace clang {
1515
namespace diag {
1616
enum {
1717
#define DIAG(ENUM, FLAGS, DEFAULT_MAPPING, DESC, GROUP, SFINAE, NOWERROR, \
18-
SHOWINSYSHEADER, DEFERRABLE, CATEGORY) \
18+
SHOWINSYSHEADER, CATEGORY) \
1919
ENUM,
2020
#define DRIVERSTART
2121
#include "clang/Basic/DiagnosticDriverKinds.inc"

‎clang/include/clang/Basic/DiagnosticFrontend.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace clang {
1515
namespace diag {
1616
enum {
1717
#define DIAG(ENUM, FLAGS, DEFAULT_MAPPING, DESC, GROUP, SFINAE, NOWERROR, \
18-
SHOWINSYSHEADER, DEFERRABLE, CATEGORY) \
18+
SHOWINSYSHEADER, CATEGORY) \
1919
ENUM,
2020
#define FRONTENDSTART
2121
#include "clang/Basic/DiagnosticFrontendKinds.inc"

‎clang/include/clang/Basic/DiagnosticIDs.h

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,8 @@ namespace clang {
6464

6565
// Get typedefs for common diagnostics.
6666
enum {
67-
#define DIAG(ENUM, FLAGS, DEFAULT_MAPPING, DESC, GROUP, SFINAE, CATEGORY, \
68-
NOWERROR, SHOWINSYSHEADER, DEFFERABLE) \
69-
ENUM,
67+
#define DIAG(ENUM,FLAGS,DEFAULT_MAPPING,DESC,GROUP,\
68+
SFINAE,CATEGORY,NOWERROR,SHOWINSYSHEADER) ENUM,
7069
#define COMMONSTART
7170
#include "clang/Basic/DiagnosticCommonKinds.inc"
7271
NUM_BUILTIN_COMMON_DIAGNOSTICS
@@ -281,13 +280,6 @@ class DiagnosticIDs : public RefCountedBase<DiagnosticIDs> {
281280
/// are not SFINAE errors.
282281
static SFINAEResponse getDiagnosticSFINAEResponse(unsigned DiagID);
283282

284-
/// Whether the diagnostic message can be deferred.
285-
///
286-
/// For single source offloading languages, a diagnostic message occurred
287-
/// in a device host function may be deferred until the function is sure
288-
/// to be emitted.
289-
static bool isDeferrable(unsigned DiagID);
290-
291283
/// Get the string of all diagnostic flags.
292284
///
293285
/// \returns A list of all diagnostics flags as they would be written in a

‎clang/include/clang/Basic/DiagnosticLex.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace clang {
1515
namespace diag {
1616
enum {
1717
#define DIAG(ENUM, FLAGS, DEFAULT_MAPPING, DESC, GROUP, SFINAE, NOWERROR, \
18-
SHOWINSYSHEADER, DEFERRABLE, CATEGORY) \
18+
SHOWINSYSHEADER, CATEGORY) \
1919
ENUM,
2020
#define LEXSTART
2121
#include "clang/Basic/DiagnosticLexKinds.inc"

‎clang/include/clang/Basic/DiagnosticParse.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace clang {
1515
namespace diag {
1616
enum {
1717
#define DIAG(ENUM, FLAGS, DEFAULT_MAPPING, DESC, GROUP, SFINAE, NOWERROR, \
18-
SHOWINSYSHEADER, DEFERRABLE, CATEGORY) \
18+
SHOWINSYSHEADER, CATEGORY) \
1919
ENUM,
2020
#define PARSESTART
2121
#include "clang/Basic/DiagnosticParseKinds.inc"

‎clang/include/clang/Basic/DiagnosticRefactoring.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace clang {
1515
namespace diag {
1616
enum {
1717
#define DIAG(ENUM, FLAGS, DEFAULT_MAPPING, DESC, GROUP, SFINAE, NOWERROR, \
18-
SHOWINSYSHEADER, DEFERRABLE, CATEGORY) \
18+
SHOWINSYSHEADER, CATEGORY) \
1919
ENUM,
2020
#define REFACTORINGSTART
2121
#include "clang/Basic/DiagnosticRefactoringKinds.inc"

‎clang/include/clang/Basic/DiagnosticSema.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace clang {
1515
namespace diag {
1616
enum {
1717
#define DIAG(ENUM, FLAGS, DEFAULT_MAPPING, DESC, GROUP, SFINAE, NOWERROR, \
18-
SHOWINSYSHEADER, DEFERRABLE, CATEGORY) \
18+
SHOWINSYSHEADER, CATEGORY) \
1919
ENUM,
2020
#define SEMASTART
2121
#include "clang/Basic/DiagnosticSemaKinds.inc"

‎clang/include/clang/Basic/DiagnosticSemaKinds.td

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4060,8 +4060,6 @@ def err_ovl_static_nonstatic_member : Error<
40604060
"static and non-static member functions with the same parameter types "
40614061
"cannot be overloaded">;
40624062

4063-
let Deferrable = 1 in {
4064-
40654063
def err_ovl_no_viable_function_in_call : Error<
40664064
"no matching function for call to %0">;
40674065
def err_ovl_no_viable_member_function_in_call : Error<
@@ -4375,8 +4373,6 @@ def err_addr_ovl_not_func_ptrref : Error<
43754373
def err_addr_ovl_no_qualifier : Error<
43764374
"cannot form member pointer of type %0 without '&' and class name">;
43774375

4378-
} // let Deferrable
4379-
43804376
// C++11 Literal Operators
43814377
def err_ovl_no_viable_literal_operator : Error<
43824378
"no matching literal operator for call to %0"

‎clang/include/clang/Basic/DiagnosticSerialization.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace clang {
1515
namespace diag {
1616
enum {
1717
#define DIAG(ENUM, FLAGS, DEFAULT_MAPPING, DESC, GROUP, SFINAE, NOWERROR, \
18-
SHOWINSYSHEADER, DEFERRABLE, CATEGORY) \
18+
SHOWINSYSHEADER, CATEGORY) \
1919
ENUM,
2020
#define SERIALIZATIONSTART
2121
#include "clang/Basic/DiagnosticSerializationKinds.inc"

‎clang/include/clang/Basic/LangOptions.def

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,6 @@ LANGOPT(CUDADeviceApproxTranscendentals, 1, 0, "using approximate transcendental
241241
LANGOPT(GPURelocatableDeviceCode, 1, 0, "generate relocatable device code")
242242
LANGOPT(GPUAllowDeviceInit, 1, 0, "allowing device side global init functions for HIP")
243243
LANGOPT(GPUMaxThreadsPerBlock, 32, 256, "default max threads per block for kernel launch bounds for HIP")
244-
LANGOPT(GPUDeferDiag, 1, 0, "defer host/device related diagnostic messages for CUDA/HIP")
245244

246245
LANGOPT(SYCL , 1, 0, "SYCL")
247246
LANGOPT(SYCLIsDevice , 1, 0, "Generate code for SYCL device")

‎clang/include/clang/Driver/Options.td

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -669,9 +669,6 @@ defm hip_new_launch_api : OptInFFlag<"hip-new-launch-api",
669669
"Use", "Don't use", " new kernel launching API for HIP">;
670670
defm gpu_allow_device_init : OptInFFlag<"gpu-allow-device-init",
671671
"Allow", "Don't allow", " device side init function in HIP">;
672-
defm gpu_defer_diag : OptInFFlag<"gpu-defer-diag",
673-
"Defer", "Don't defer", " host/device related diagnostic messages"
674-
" for CUDA/HIP">;
675672
def gpu_max_threads_per_block_EQ : Joined<["--"], "gpu-max-threads-per-block=">,
676673
Flags<[CC1Option]>,
677674
HelpText<"Default max threads per block for kernel launch bounds for HIP">;

0 commit comments

Comments
 (0)