Commit 1c40a4df094132db952157bf28253ed80646ea00 | zig

lib/std/target.zig+12-5

...	...	@@ -36,11 +36,11 @@ pub const Target = struct {
36	36	openbsd,
37	37	solaris,
38	38	windows,
	39	zos,
39	40	haiku,
40	41	minix,
41	42	rtems,
42	43	nacl,
43		cnk,
44	44	aix,
45	45	cuda,
46	46	nvcl,
...	...	@@ -206,11 +206,11 @@ pub const Target = struct {
206	206	.kfreebsd,
207	207	.lv2,
208	208	.solaris,
	209	.zos,
209	210	.haiku,
210	211	.minix,
211	212	.rtems,
212	213	.nacl,
213		.cnk,
214	214	.aix,
215	215	.cuda,
216	216	.nvcl,
...	...	@@ -358,11 +358,11 @@ pub const Target = struct {
358	358	.kfreebsd,
359	359	.lv2,
360	360	.solaris,
	361	.zos,
361	362	.haiku,
362	363	.minix,
363	364	.rtems,
364	365	.nacl,
365		.cnk,
366	366	.aix,
367	367	.cuda,
368	368	.nvcl,
...	...	@@ -432,11 +432,11 @@ pub const Target = struct {
432	432	.dragonfly,
433	433	.lv2,
434	434	.solaris,
	435	.zos,
435	436	.haiku,
436	437	.minix,
437	438	.rtems,
438	439	.nacl,
439		.cnk,
440	440	.aix,
441	441	.cuda,
442	442	.nvcl,
...	...	@@ -673,6 +673,7 @@ pub const Target = struct {
673	673	avr,
674	674	bpfel,
675	675	bpfeb,
	676	csky,
676	677	hexagon,
677	678	mips,
678	679	mipsel,
...	...	@@ -827,6 +828,7 @@ pub const Target = struct {
827	828	.amdgcn => ._NONE,
828	829	.bpfel => ._BPF,
829	830	.bpfeb => ._BPF,
	831	.csky => ._CSKY,
830	832	.sparcv9 => ._SPARCV9,
831	833	.s390x => ._S390,
832	834	.ve => ._NONE,
...	...	@@ -884,6 +886,7 @@ pub const Target = struct {
884	886	.amdgcn => .Unknown,
885	887	.bpfel => .Unknown,
886	888	.bpfeb => .Unknown,
	889	.csky => .Unknown,
887	890	.sparcv9 => .Unknown,
888	891	.s390x => .Unknown,
889	892	.ve => .Unknown,
...	...	@@ -901,6 +904,7 @@ pub const Target = struct {
901	904	.amdil,
902	905	.amdil64,
903	906	.bpfel,
	907	.csky,
904	908	.hexagon,
905	909	.hsail,
906	910	.hsail64,
...	...	@@ -961,6 +965,7 @@ pub const Target = struct {
961	965	.arc,
962	966	.arm,
963	967	.armeb,
	968	.csky,
964	969	.hexagon,
965	970	.le32,
966	971	.mips,
...	...	@@ -1020,6 +1025,7 @@ pub const Target = struct {
1020	1025	.aarch64, .aarch64_be, .aarch64_32 => "aarch64",
1021	1026	.avr => "avr",
1022	1027	.bpfel, .bpfeb => "bpf",
	1028	.csky => "csky",
1023	1029	.hexagon => "hexagon",
1024	1030	.mips, .mipsel, .mips64, .mips64el => "mips",
1025	1031	.msp430 => "msp430",
...	...	@@ -1461,6 +1467,7 @@ pub const Target = struct {
1461	1467	// TODO go over each item in this list and either move it to the above list, or
1462	1468	// implement the standard dynamic linker path code for it.
1463	1469	.arc,
	1470	.csky,
1464	1471	.hexagon,
1465	1472	.msp430,
1466	1473	.r600,
...	...	@@ -1509,11 +1516,11 @@ pub const Target = struct {
1509	1516	.kfreebsd,
1510	1517	.lv2,
1511	1518	.solaris,
	1519	.zos,
1512	1520	.haiku,
1513	1521	.minix,
1514	1522	.rtems,
1515	1523	.nacl,
1516		.cnk,
1517	1524	.aix,
1518	1525	.cuda,
1519	1526	.nvcl,

lib/std/zig/cross_target.zig+2-2

...	...	@@ -111,11 +111,11 @@ pub const CrossTarget = struct {
111	111	.kfreebsd,
112	112	.lv2,
113	113	.solaris,
	114	.zos,
114	115	.haiku,
115	116	.minix,
116	117	.rtems,
117	118	.nacl,
118		.cnk,
119	119	.aix,
120	120	.cuda,
121	121	.nvcl,
...	...	@@ -711,11 +711,11 @@ pub const CrossTarget = struct {
711	711	.kfreebsd,
712	712	.lv2,
713	713	.solaris,
	714	.zos,
714	715	.haiku,
715	716	.minix,
716	717	.rtems,
717	718	.nacl,
718		.cnk,
719	719	.aix,
720	720	.cuda,
721	721	.nvcl,

src/codegen/llvm.zig+2-1

...	...	@@ -12,6 +12,7 @@ pub fn targetTriple(allocator: *Allocator, target: std.Target) ![]u8 {
12	12	.avr => "avr",
13	13	.bpfel => "bpfel",
14	14	.bpfeb => "bpfeb",
	15	.csky => "csky",
15	16	.hexagon => "hexagon",
16	17	.mips => "mips",
17	18	.mipsel => "mipsel",
...	...	@@ -74,11 +75,11 @@ pub fn targetTriple(allocator: *Allocator, target: std.Target) ![]u8 {
74	75	.openbsd => "openbsd",
75	76	.solaris => "solaris",
76	77	.windows => "windows",
	78	.zos => "zos",
77	79	.haiku => "haiku",
78	80	.minix => "minix",
79	81	.rtems => "rtems",
80	82	.nacl => "nacl",
81		.cnk => "cnk",
82	83	.aix => "aix",
83	84	.cuda => "cuda",
84	85	.nvcl => "nvcl",

src/llvm.zig+49-47

...	...	@@ -15,6 +15,7 @@ pub const ObjectFormatType = extern enum(c_int) {
15	15	Unknown,
16	16	COFF,
17	17	ELF,
	18	GOFF,
18	19	MachO,
19	20	Wasm,
20	21	XCOFF,
...	...	@@ -51,11 +52,11 @@ pub const OSType = extern enum(c_int) {
51	52	OpenBSD = 13,
52	53	Solaris = 14,
53	54	Win32 = 15,
54		Haiku = 16,
55		Minix = 17,
56		RTEMS = 18,
57		NaCl = 19,
58		CNK = 20,
	55	ZOS = 16,
	56	Haiku = 17,
	57	Minix = 18,
	58	RTEMS = 19,
	59	NaCl = 20,
59	60	AIX = 21,
60	61	CUDA = 22,
61	62	NVCL = 23,
...	...	@@ -84,48 +85,49 @@ pub const ArchType = extern enum(c_int) {
84	85	avr = 7,
85	86	bpfel = 8,
86	87	bpfeb = 9,
87		hexagon = 10,
88		mips = 11,
89		mipsel = 12,
90		mips64 = 13,
91		mips64el = 14,
92		msp430 = 15,
93		ppc = 16,
94		ppc64 = 17,
95		ppc64le = 18,
96		r600 = 19,
97		amdgcn = 20,
98		riscv32 = 21,
99		riscv64 = 22,
100		sparc = 23,
101		sparcv9 = 24,
102		sparcel = 25,
103		systemz = 26,
104		tce = 27,
105		tcele = 28,
106		thumb = 29,
107		thumbeb = 30,
108		x86 = 31,
109		x86_64 = 32,
110		xcore = 33,
111		nvptx = 34,
112		nvptx64 = 35,
113		le32 = 36,
114		le64 = 37,
115		amdil = 38,
116		amdil64 = 39,
117		hsail = 40,
118		hsail64 = 41,
119		spir = 42,
120		spir64 = 43,
121		kalimba = 44,
122		shave = 45,
123		lanai = 46,
124		wasm32 = 47,
125		wasm64 = 48,
126		renderscript32 = 49,
127		renderscript64 = 50,
128		ve = 51,
	88	csky = 10,
	89	hexagon = 11,
	90	mips = 12,
	91	mipsel = 13,
	92	mips64 = 14,
	93	mips64el = 15,
	94	msp430 = 16,
	95	ppc = 17,
	96	ppc64 = 18,
	97	ppc64le = 19,
	98	r600 = 20,
	99	amdgcn = 21,
	100	riscv32 = 22,
	101	riscv64 = 23,
	102	sparc = 24,
	103	sparcv9 = 25,
	104	sparcel = 26,
	105	systemz = 27,
	106	tce = 28,
	107	tcele = 29,
	108	thumb = 30,
	109	thumbeb = 31,
	110	x86 = 32,
	111	x86_64 = 33,
	112	xcore = 34,
	113	nvptx = 35,
	114	nvptx64 = 36,
	115	le32 = 37,
	116	le64 = 38,
	117	amdil = 39,
	118	amdil64 = 40,
	119	hsail = 41,
	120	hsail64 = 42,
	121	spir = 43,
	122	spir64 = 44,
	123	kalimba = 45,
	124	shave = 46,
	125	lanai = 47,
	126	wasm32 = 48,
	127	wasm64 = 49,
	128	renderscript32 = 50,
	129	renderscript64 = 51,
	130	ve = 52,
129	131	};
130	132
131	133	pub const ParseCommandLineOptions = ZigLLVMParseCommandLineOptions;

src/stage1/stage1.h+1-1

...	...	@@ -73,11 +73,11 @@ enum Os {
73	73	OsOpenBSD,
74	74	OsSolaris,
75	75	OsWindows,
	76	OsZOS,
76	77	OsHaiku,
77	78	OsMinix,
78	79	OsRTEMS,
79	80	OsNaCl, // Native Client
80		OsCNK, // BG/P Compute-Node Kernel
81	81	OsAIX,
82	82	OsCUDA, // NVIDIA CUDA
83	83	OsNVCL, // NVIDIA OpenCL

src/stage1/target.cpp+14-8

...	...	@@ -23,6 +23,7 @@ static const ZigLLVM_ArchType arch_list[] = {
23	23	ZigLLVM_avr, // AVR: Atmel AVR microcontroller
24	24	ZigLLVM_bpfel, // eBPF or extended BPF or 64-bit BPF (little endian)
25	25	ZigLLVM_bpfeb, // eBPF or extended BPF or 64-bit BPF (big endian)
	26	ZigLLVM_csky, // CSKY: csky
26	27	ZigLLVM_hexagon, // Hexagon: hexagon
27	28	ZigLLVM_mips, // MIPS: mips, mipsallegrex, mipsr6
28	29	ZigLLVM_mipsel, // MIPSEL: mipsel, mipsallegrexe, mipsr6el
...	...	@@ -71,8 +72,6 @@ static const ZigLLVM_VendorType vendor_list[] = {
71	72	ZigLLVM_Apple,
72	73	ZigLLVM_PC,
73	74	ZigLLVM_SCEI,
74		ZigLLVM_BGP,
75		ZigLLVM_BGQ,
76	75	ZigLLVM_Freescale,
77	76	ZigLLVM_IBM,
78	77	ZigLLVM_ImaginationTechnologies,
...	...	@@ -101,11 +100,11 @@ static const Os os_list[] = {
101	100	OsOpenBSD,
102	101	OsSolaris,
103	102	OsWindows,
	103	OsZOS,
104	104	OsHaiku,
105	105	OsMinix,
106	106	OsRTEMS,
107	107	OsNaCl, // Native Client
108		OsCNK, // BG/P Compute-Node Kernel
109	108	OsAIX,
110	109	OsCUDA, // NVIDIA CUDA
111	110	OsNVCL, // NVIDIA OpenCL
...	...	@@ -155,8 +154,10 @@ static const ZigLLVM_ObjectFormatType oformat_list[] = {
155	154	ZigLLVM_UnknownObjectFormat,
156	155	ZigLLVM_COFF,
157	156	ZigLLVM_ELF,
	157	ZigLLVM_GOFF,
158	158	ZigLLVM_MachO,
159	159	ZigLLVM_Wasm,
	160	ZigLLVM_XCOFF,
160	161	};
161	162
162	163	size_t target_oformat_count(void) {
...	...	@@ -173,6 +174,7 @@ const char *target_oformat_name(ZigLLVM_ObjectFormatType oformat) {
173	174	case ZigLLVM_UnknownObjectFormat: return "unknown";
174	175	case ZigLLVM_COFF: return "coff";
175	176	case ZigLLVM_ELF: return "elf";
	177	case ZigLLVM_GOFF: return "goff";
176	178	case ZigLLVM_MachO: return "macho";
177	179	case ZigLLVM_Wasm: return "wasm";
178	180	case ZigLLVM_XCOFF: return "xcoff";
...	...	@@ -240,6 +242,8 @@ ZigLLVM_OSType get_llvm_os_type(Os os_type) {
240	242	case OsWindows:
241	243	case OsUefi:
242	244	return ZigLLVM_Win32;
	245	case OsZOS:
	246	return ZigLLVM_ZOS;
243	247	case OsHaiku:
244	248	return ZigLLVM_Haiku;
245	249	case OsMinix:
...	...	@@ -248,8 +252,6 @@ ZigLLVM_OSType get_llvm_os_type(Os os_type) {
248	252	return ZigLLVM_RTEMS;
249	253	case OsNaCl:
250	254	return ZigLLVM_NaCl;
251		case OsCNK:
252		return ZigLLVM_CNK;
253	255	case OsAIX:
254	256	return ZigLLVM_AIX;
255	257	case OsCUDA:
...	...	@@ -306,11 +308,11 @@ const char *target_os_name(Os os_type) {
306	308	case OsOpenBSD:
307	309	case OsSolaris:
308	310	case OsWindows:
	311	case OsZOS:
309	312	case OsHaiku:
310	313	case OsMinix:
311	314	case OsRTEMS:
312	315	case OsNaCl: // Native Client
313		case OsCNK: // BG/P Compute-Node Kernel
314	316	case OsAIX:
315	317	case OsCUDA: // NVIDIA CUDA
316	318	case OsNVCL: // NVIDIA OpenCL
...	...	@@ -501,6 +503,7 @@ uint32_t target_arch_pointer_bit_width(ZigLLVM_ArchType arch) {
501	503	case ZigLLVM_wasm32:
502	504	case ZigLLVM_renderscript32:
503	505	case ZigLLVM_aarch64_32:
	506	case ZigLLVM_csky:
504	507	return 32;
505	508
506	509	case ZigLLVM_aarch64:
...	...	@@ -565,6 +568,7 @@ uint32_t target_arch_largest_atomic_bits(ZigLLVM_ArchType arch) {
565	568	case ZigLLVM_shave:
566	569	case ZigLLVM_wasm32:
567	570	case ZigLLVM_renderscript32:
	571	case ZigLLVM_csky:
568	572	return 32;
569	573
570	574	case ZigLLVM_aarch64:
...	...	@@ -703,11 +707,11 @@ uint32_t target_c_type_size_in_bits(const ZigTarget *target, CIntType id) {
703	707	case OsKFreeBSD:
704	708	case OsLv2:
705	709	case OsSolaris:
	710	case OsZOS:
706	711	case OsHaiku:
707	712	case OsMinix:
708	713	case OsRTEMS:
709	714	case OsNaCl:
710		case OsCNK:
711	715	case OsAIX:
712	716	case OsCUDA:
713	717	case OsNVCL:
...	...	@@ -811,6 +815,7 @@ const char *arch_stack_pointer_register_name(ZigLLVM_ArchType arch) {
811	815	case ZigLLVM_avr:
812	816	case ZigLLVM_bpfeb:
813	817	case ZigLLVM_bpfel:
	818	case ZigLLVM_csky:
814	819	case ZigLLVM_hexagon:
815	820	case ZigLLVM_lanai:
816	821	case ZigLLVM_hsail:
...	...	@@ -865,6 +870,7 @@ bool target_is_arm(const ZigTarget *target) {
865	870	case ZigLLVM_avr:
866	871	case ZigLLVM_bpfeb:
867	872	case ZigLLVM_bpfel:
	873	case ZigLLVM_csky:
868	874	case ZigLLVM_hexagon:
869	875	case ZigLLVM_lanai:
870	876	case ZigLLVM_hsail:
...	...	@@ -948,11 +954,11 @@ ZigLLVM_EnvironmentType target_default_abi(ZigLLVM_ArchType arch, Os os) {
948	954	case OsCloudABI:
949	955	case OsLv2:
950	956	case OsSolaris:
	957	case OsZOS:
951	958	case OsHaiku:
952	959	case OsMinix:
953	960	case OsRTEMS:
954	961	case OsNaCl:
955		case OsCNK:
956	962	case OsAIX:
957	963	case OsCUDA:
958	964	case OsNVCL:

src/stage1/zig0.cpp+2-2

...	...	@@ -94,6 +94,8 @@ static Os get_zig_os_type(ZigLLVM_OSType os_type) {
94	94	return OsSolaris;
95	95	case ZigLLVM_Win32:
96	96	return OsWindows;
	97	case ZigLLVM_ZOS:
	98	return OsZOS;
97	99	case ZigLLVM_Haiku:
98	100	return OsHaiku;
99	101	case ZigLLVM_Minix:
...	...	@@ -102,8 +104,6 @@ static Os get_zig_os_type(ZigLLVM_OSType os_type) {
102	104	return OsRTEMS;
103	105	case ZigLLVM_NaCl:
104	106	return OsNaCl;
105		case ZigLLVM_CNK:
106		return OsCNK;
107	107	case ZigLLVM_AIX:
108	108	return OsAIX;
109	109	case ZigLLVM_CUDA:

src/target.zig+1-1

...	...	@@ -206,11 +206,11 @@ pub fn osToLLVM(os_tag: std.Target.Os.Tag) llvm.OSType {
206	206	.netbsd => .NetBSD,
207	207	.openbsd => .OpenBSD,
208	208	.solaris => .Solaris,
	209	.zos => .ZOS,
209	210	.haiku => .Haiku,
210	211	.minix => .Minix,
211	212	.rtems => .RTEMS,
212	213	.nacl => .NaCl,
213		.cnk => .CNK,
214	214	.aix => .AIX,
215	215	.cuda => .CUDA,
216	216	.nvcl => .NVCL,

src/type.zig+1-1

...	...	@@ -3236,11 +3236,11 @@ pub const CType = enum {
3236	3236	.kfreebsd,
3237	3237	.lv2,
3238	3238	.solaris,
	3239	.zos,
3239	3240	.haiku,
3240	3241	.minix,
3241	3242	.rtems,
3242	3243	.nacl,
3243		.cnk,
3244	3244	.aix,
3245	3245	.cuda,
3246	3246	.nvcl,

src/zig_clang.cpp+21-7

...	...	@@ -182,6 +182,8 @@ void ZigClang_detect_enum_CK(clang::CastKind x) {
182	182	case clang::CK_IntegralToBoolean:
183	183	case clang::CK_IntegralToFloating:
184	184	case clang::CK_IntegralToPointer:
	185	case clang::CK_FloatingToFixedPoint:
	186	case clang::CK_FixedPointToFloating:
185	187	case clang::CK_LValueBitCast:
186	188	case clang::CK_LValueToRValueBitCast:
187	189	case clang::CK_LValueToRValue:
...	...	@@ -237,6 +239,8 @@ static_assert((clang::CastKind)ZigClangCK_VectorSplat == clang::CK_VectorSplat,
237	239	static_assert((clang::CastKind)ZigClangCK_IntegralCast == clang::CK_IntegralCast, "");
238	240	static_assert((clang::CastKind)ZigClangCK_IntegralToBoolean == clang::CK_IntegralToBoolean, "");
239	241	static_assert((clang::CastKind)ZigClangCK_IntegralToFloating == clang::CK_IntegralToFloating, "");
	242	static_assert((clang::CastKind)ZigClangCK_FloatingToFixedPoint == clang::CK_FloatingToFixedPoint, "");
	243	static_assert((clang::CastKind)ZigClangCK_FixedPointToFloating == clang::CK_FixedPointToFloating, "");
240	244	static_assert((clang::CastKind)ZigClangCK_FixedPointCast == clang::CK_FixedPointCast, "");
241	245	static_assert((clang::CastKind)ZigClangCK_FixedPointToIntegral == clang::CK_FixedPointToIntegral, "");
242	246	static_assert((clang::CastKind)ZigClangCK_IntegralToFixedPoint == clang::CK_IntegralToFixedPoint, "");
...	...	@@ -928,6 +932,7 @@ void ZigClang_detect_enum_DeclKind(clang::Decl::Kind x) {
928	932	case clang::Decl::MSGuid:
929	933	case clang::Decl::OMPDeclareMapper:
930	934	case clang::Decl::OMPDeclareReduction:
	935	case clang::Decl::TemplateParamObject:
931	936	case clang::Decl::UnresolvedUsingValue:
932	937	case clang::Decl::OMPAllocate:
933	938	case clang::Decl::OMPRequires:
...	...	@@ -1013,6 +1018,7 @@ static_assert((clang::Decl::Kind)ZigClangDeclIndirectField == clang::Decl::Indir
1013	1018	static_assert((clang::Decl::Kind)ZigClangDeclMSGuid == clang::Decl::MSGuid, "");
1014	1019	static_assert((clang::Decl::Kind)ZigClangDeclOMPDeclareMapper == clang::Decl::OMPDeclareMapper, "");
1015	1020	static_assert((clang::Decl::Kind)ZigClangDeclOMPDeclareReduction == clang::Decl::OMPDeclareReduction, "");
	1021	static_assert((clang::Decl::Kind)ZigClangDeclTemplateParamObject == clang::Decl::TemplateParamObject, "");
1016	1022	static_assert((clang::Decl::Kind)ZigClangDeclUnresolvedUsingValue == clang::Decl::UnresolvedUsingValue, "");
1017	1023	static_assert((clang::Decl::Kind)ZigClangDeclOMPRequires == clang::Decl::OMPRequires, "");
1018	1024	static_assert((clang::Decl::Kind)ZigClangDeclOMPThreadPrivate == clang::Decl::OMPThreadPrivate, "");
...	...	@@ -1122,6 +1128,8 @@ void ZigClang_detect_enum_BuiltinTypeKind(clang::BuiltinType::Kind x) {
1122	1128	case clang::BuiltinType::SveFloat64x4:
1123	1129	case clang::BuiltinType::SveBFloat16x4:
1124	1130	case clang::BuiltinType::SveBool:
	1131	case clang::BuiltinType::VectorQuad:
	1132	case clang::BuiltinType::VectorPair:
1125	1133	case clang::BuiltinType::Void:
1126	1134	case clang::BuiltinType::Bool:
1127	1135	case clang::BuiltinType::Char_U:
...	...	@@ -1295,6 +1303,8 @@ static_assert((clang::BuiltinType::Kind)ZigClangBuiltinTypeSveFloat32x4 == clang
1295	1303	static_assert((clang::BuiltinType::Kind)ZigClangBuiltinTypeSveFloat64x4 == clang::BuiltinType::SveFloat64x4, "");
1296	1304	static_assert((clang::BuiltinType::Kind)ZigClangBuiltinTypeSveBFloat16x4 == clang::BuiltinType::SveBFloat16x4, "");
1297	1305	static_assert((clang::BuiltinType::Kind)ZigClangBuiltinTypeSveBool == clang::BuiltinType::SveBool, "");
	1306	static_assert((clang::BuiltinType::Kind)ZigClangBuiltinTypeVectorQuad == clang::BuiltinType::VectorQuad, "");
	1307	static_assert((clang::BuiltinType::Kind)ZigClangBuiltinTypeVectorPair == clang::BuiltinType::VectorPair, "");
1298	1308	static_assert((clang::BuiltinType::Kind)ZigClangBuiltinTypeVoid == clang::BuiltinType::Void, "");
1299	1309	static_assert((clang::BuiltinType::Kind)ZigClangBuiltinTypeBool == clang::BuiltinType::Bool, "");
1300	1310	static_assert((clang::BuiltinType::Kind)ZigClangBuiltinTypeChar_U == clang::BuiltinType::Char_U, "");
...	...	@@ -1517,15 +1527,19 @@ static_assert((clang::PreprocessedEntity::EntityKind)ZigClangPreprocessedEntity_
1517	1527	static_assert((clang::PreprocessedEntity::EntityKind)ZigClangPreprocessedEntity_InclusionDirectiveKind == clang::PreprocessedEntity::InclusionDirectiveKind, "");
1518	1528
1519	1529
1520		void ZigClang_detect_enum_ConstExprUsage(clang::Expr::ConstExprUsage x) {
	1530	void ZigClang_detect_enum_ConstantExprKind(clang::Expr::ConstantExprKind x) {
1521	1531	switch (x) {
1522		case clang::Expr::EvaluateForCodeGen:
1523		case clang::Expr::EvaluateForMangling:
	1532	case clang::Expr::ConstantExprKind::Normal:
	1533	case clang::Expr::ConstantExprKind::NonClassTemplateArgument:
	1534	case clang::Expr::ConstantExprKind::ClassTemplateArgument:
	1535	case clang::Expr::ConstantExprKind::ImmediateInvocation:
1524	1536	break;
1525	1537	}
1526	1538	}
1527		static_assert((clang::Expr::ConstExprUsage)ZigClangExpr_EvaluateForCodeGen == clang::Expr::EvaluateForCodeGen, "");
1528		static_assert((clang::Expr::ConstExprUsage)ZigClangExpr_EvaluateForMangling == clang::Expr::EvaluateForMangling, "");
	1539	static_assert((clang::Expr::ConstantExprKind)ZigClangExpr_ContantExprKind_Normal == clang::Expr::ConstantExprKind::Normal, "");
	1540	static_assert((clang::Expr::ConstantExprKind)ZigClangExpr_ContantExprKind_NonClassTemplateArgument == clang::Expr::ConstantExprKind::NonClassTemplateArgument, "");
	1541	static_assert((clang::Expr::ConstantExprKind)ZigClangExpr_ContantExprKind_ClassTemplateArgument == clang::Expr::ConstantExprKind::ClassTemplateArgument, "");
	1542	static_assert((clang::Expr::ConstantExprKind)ZigClangExpr_ContantExprKind_ImmediateInvocation == clang::Expr::ConstantExprKind::ImmediateInvocation, "");
1529	1543
1530	1544
1531	1545	static_assert(sizeof(ZigClangAPValue) == sizeof(clang::APValue), "");
...	...	@@ -2143,12 +2157,12 @@ bool ZigClangExpr_EvaluateAsFloat(const ZigClangExpr self, ZigClangAPFloat *re
2143	2157	}
2144	2158
2145	2159	bool ZigClangExpr_EvaluateAsConstantExpr(const ZigClangExpr self, ZigClangExprEvalResult result,
2146		ZigClangExpr_ConstExprUsage usage, const struct ZigClangASTContext *ctx)
	2160	ZigClangExpr_ConstantExprKind kind, const struct ZigClangASTContext *ctx)
2147	2161	{
2148	2162	auto casted_self = reinterpret_cast<const clang::Expr *>(self);
2149	2163	auto casted_ctx = reinterpret_cast<const clang::ASTContext *>(ctx);
2150	2164	clang::Expr::EvalResult eval_result;
2151		if (!casted_self->EvaluateAsConstantExpr(eval_result, (clang::Expr::ConstExprUsage)usage, *casted_ctx)) {
	2165	if (!casted_self->EvaluateAsConstantExpr(eval_result, *casted_ctx, (clang::Expr::ConstantExprKind)kind)) {
2152	2166	return false;
2153	2167	}
2154	2168	*result = bitcast(eval_result);

src/zig_clang.h+11-4

...	...	@@ -523,6 +523,8 @@ enum ZigClangCK {
523	523	ZigClangCK_IntegralCast,
524	524	ZigClangCK_IntegralToBoolean,
525	525	ZigClangCK_IntegralToFloating,
	526	ZigClangCK_FloatingToFixedPoint,
	527	ZigClangCK_FixedPointToFloating,
526	528	ZigClangCK_FixedPointCast,
527	529	ZigClangCK_FixedPointToIntegral,
528	530	ZigClangCK_IntegralToFixedPoint,
...	...	@@ -629,6 +631,7 @@ enum ZigClangDeclKind {
629	631	ZigClangDeclMSGuid,
630	632	ZigClangDeclOMPDeclareMapper,
631	633	ZigClangDeclOMPDeclareReduction,
	634	ZigClangDeclTemplateParamObject,
632	635	ZigClangDeclUnresolvedUsingValue,
633	636	ZigClangDeclOMPAllocate,
634	637	ZigClangDeclOMPRequires,
...	...	@@ -739,6 +742,8 @@ enum ZigClangBuiltinTypeKind {
739	742	ZigClangBuiltinTypeSveFloat64x4,
740	743	ZigClangBuiltinTypeSveBFloat16x4,
741	744	ZigClangBuiltinTypeSveBool,
	745	ZigClangBuiltinTypeVectorQuad,
	746	ZigClangBuiltinTypeVectorPair,
742	747	ZigClangBuiltinTypeVoid,
743	748	ZigClangBuiltinTypeBool,
744	749	ZigClangBuiltinTypeChar_U,
...	...	@@ -897,9 +902,11 @@ enum ZigClangPreprocessedEntity_EntityKind {
897	902	ZigClangPreprocessedEntity_InclusionDirectiveKind,
898	903	};
899	904
900		enum ZigClangExpr_ConstExprUsage {
901		ZigClangExpr_EvaluateForCodeGen,
902		ZigClangExpr_EvaluateForMangling,
	905	enum ZigClangExpr_ConstantExprKind {
	906	ZigClangExpr_ContantExprKind_Normal,
	907	ZigClangExpr_ContantExprKind_NonClassTemplateArgument,
	908	ZigClangExpr_ContantExprKind_ClassTemplateArgument,
	909	ZigClangExpr_ContantExprKind_ImmediateInvocation,
903	910	};
904	911
905	912	enum ZigClangUnaryExprOrTypeTrait_Kind {
...	...	@@ -1058,7 +1065,7 @@ ZIG_EXTERN_C bool ZigClangExpr_EvaluateAsBooleanCondition(const struct ZigClangE
1058	1065	ZIG_EXTERN_C bool ZigClangExpr_EvaluateAsFloat(const struct ZigClangExpr *self,
1059	1066	ZigClangAPFloat *result, const struct ZigClangASTContext ctx);
1060	1067	ZIG_EXTERN_C bool ZigClangExpr_EvaluateAsConstantExpr(const struct ZigClangExpr *,
1061		struct ZigClangExprEvalResult , ZigClangExpr_ConstExprUsage, const struct ZigClangASTContext );
	1068	struct ZigClangExprEvalResult , ZigClangExpr_ConstantExprKind, const struct ZigClangASTContext );
1062	1069
1063	1070	ZIG_EXTERN_C const ZigClangExpr ZigClangInitListExpr_getInit(const ZigClangInitListExpr , unsigned);
1064	1071	ZIG_EXTERN_C const ZigClangExpr ZigClangInitListExpr_getArrayFiller(const ZigClangInitListExpr );

src/zig_llvm.cpp+8-6

...	...	@@ -600,8 +600,9 @@ void ZigLLVMDisposeDIBuilder(ZigLLVMDIBuilder *dbuilder) {
600	600	}
601	601
602	602	void ZigLLVMSetCurrentDebugLocation(LLVMBuilderRef builder, int line, int column, ZigLLVMDIScope *scope) {
603		unwrap(builder)->SetCurrentDebugLocation(DebugLoc::get(
604		line, column, reinterpret_cast<DIScope*>(scope)));
	603	DIScope* di_scope = reinterpret_cast<DIScope*>(scope);
	604	DebugLoc debug_loc = DILocation::get(di_scope->getContext(), line, column, di_scope, nullptr, false);
	605	unwrap(builder)->SetCurrentDebugLocation(debug_loc);
605	606	}
606	607
607	608	void ZigLLVMClearCurrentDebugLocation(LLVMBuilderRef builder) {
...	...	@@ -762,7 +763,8 @@ LLVMValueRef ZigLLVMInsertDeclare(ZigLLVMDIBuilder *dibuilder, LLVMValueRef stor
762	763	}
763	764
764	765	ZigLLVMDILocation ZigLLVMGetDebugLoc(unsigned line, unsigned col, ZigLLVMDIScope scope) {
765		DebugLoc debug_loc = DebugLoc::get(line, col, reinterpret_cast<DIScope*>(scope), nullptr);
	766	DIScope* di_scope = reinterpret_cast<DIScope*>(scope);
	767	DebugLoc debug_loc = DILocation::get(di_scope->getContext(), line, col, di_scope, nullptr, false);
766	768	return reinterpret_cast<ZigLLVMDILocation*>(debug_loc.get());
767	769	}
768	770
...	...	@@ -1180,6 +1182,7 @@ static_assert((Triple::ArchType)ZigLLVM_arc == Triple::arc, "");
1180	1182	static_assert((Triple::ArchType)ZigLLVM_avr == Triple::avr, "");
1181	1183	static_assert((Triple::ArchType)ZigLLVM_bpfel == Triple::bpfel, "");
1182	1184	static_assert((Triple::ArchType)ZigLLVM_bpfeb == Triple::bpfeb, "");
	1185	static_assert((Triple::ArchType)ZigLLVM_csky == Triple::csky, "");
1183	1186	static_assert((Triple::ArchType)ZigLLVM_hexagon == Triple::hexagon, "");
1184	1187	static_assert((Triple::ArchType)ZigLLVM_mips == Triple::mips, "");
1185	1188	static_assert((Triple::ArchType)ZigLLVM_mipsel == Triple::mipsel, "");
...	...	@@ -1228,8 +1231,6 @@ static_assert((Triple::VendorType)ZigLLVM_UnknownVendor == Triple::UnknownVendor
1228	1231	static_assert((Triple::VendorType)ZigLLVM_Apple == Triple::Apple, "");
1229	1232	static_assert((Triple::VendorType)ZigLLVM_PC == Triple::PC, "");
1230	1233	static_assert((Triple::VendorType)ZigLLVM_SCEI == Triple::SCEI, "");
1231		static_assert((Triple::VendorType)ZigLLVM_BGP == Triple::BGP, "");
1232		static_assert((Triple::VendorType)ZigLLVM_BGQ == Triple::BGQ, "");
1233	1234	static_assert((Triple::VendorType)ZigLLVM_Freescale == Triple::Freescale, "");
1234	1235	static_assert((Triple::VendorType)ZigLLVM_IBM == Triple::IBM, "");
1235	1236	static_assert((Triple::VendorType)ZigLLVM_ImaginationTechnologies == Triple::ImaginationTechnologies, "");
...	...	@@ -1261,11 +1262,11 @@ static_assert((Triple::OSType)ZigLLVM_NetBSD == Triple::NetBSD, "");
1261	1262	static_assert((Triple::OSType)ZigLLVM_OpenBSD == Triple::OpenBSD, "");
1262	1263	static_assert((Triple::OSType)ZigLLVM_Solaris == Triple::Solaris, "");
1263	1264	static_assert((Triple::OSType)ZigLLVM_Win32 == Triple::Win32, "");
	1265	static_assert((Triple::OSType)ZigLLVM_ZOS == Triple::ZOS, "");
1264	1266	static_assert((Triple::OSType)ZigLLVM_Haiku == Triple::Haiku, "");
1265	1267	static_assert((Triple::OSType)ZigLLVM_Minix == Triple::Minix, "");
1266	1268	static_assert((Triple::OSType)ZigLLVM_RTEMS == Triple::RTEMS, "");
1267	1269	static_assert((Triple::OSType)ZigLLVM_NaCl == Triple::NaCl, "");
1268		static_assert((Triple::OSType)ZigLLVM_CNK == Triple::CNK, "");
1269	1270	static_assert((Triple::OSType)ZigLLVM_AIX == Triple::AIX, "");
1270	1271	static_assert((Triple::OSType)ZigLLVM_CUDA == Triple::CUDA, "");
1271	1272	static_assert((Triple::OSType)ZigLLVM_NVCL == Triple::NVCL, "");
...	...	@@ -1308,6 +1309,7 @@ static_assert((Triple::EnvironmentType)ZigLLVM_LastEnvironmentType == Triple::La
1308	1309	static_assert((Triple::ObjectFormatType)ZigLLVM_UnknownObjectFormat == Triple::UnknownObjectFormat, "");
1309	1310	static_assert((Triple::ObjectFormatType)ZigLLVM_COFF == Triple::COFF, "");
1310	1311	static_assert((Triple::ObjectFormatType)ZigLLVM_ELF == Triple::ELF, "");
	1312	static_assert((Triple::ObjectFormatType)ZigLLVM_GOFF == Triple::GOFF, "");
1311	1313	static_assert((Triple::ObjectFormatType)ZigLLVM_MachO == Triple::MachO, "");
1312	1314	static_assert((Triple::ObjectFormatType)ZigLLVM_Wasm == Triple::Wasm, "");
1313	1315	static_assert((Triple::ObjectFormatType)ZigLLVM_XCOFF == Triple::XCOFF, "");

src/zig_llvm.h+3-3

...	...	@@ -288,6 +288,7 @@ enum ZigLLVM_ArchType {
288	288	ZigLLVM_avr, // AVR: Atmel AVR microcontroller
289	289	ZigLLVM_bpfel, // eBPF or extended BPF or 64-bit BPF (little endian)
290	290	ZigLLVM_bpfeb, // eBPF or extended BPF or 64-bit BPF (big endian)
	291	ZigLLVM_csky, // CSKY: csky
291	292	ZigLLVM_hexagon, // Hexagon: hexagon
292	293	ZigLLVM_mips, // MIPS: mips, mipsallegrex, mipsr6
293	294	ZigLLVM_mipsel, // MIPSEL: mipsel, mipsallegrexe, mipsr6el
...	...	@@ -340,8 +341,6 @@ enum ZigLLVM_VendorType {
340	341	ZigLLVM_Apple,
341	342	ZigLLVM_PC,
342	343	ZigLLVM_SCEI,
343		ZigLLVM_BGP,
344		ZigLLVM_BGQ,
345	344	ZigLLVM_Freescale,
346	345	ZigLLVM_IBM,
347	346	ZigLLVM_ImaginationTechnologies,
...	...	@@ -375,11 +374,11 @@ enum ZigLLVM_OSType {
375	374	ZigLLVM_OpenBSD,
376	375	ZigLLVM_Solaris,
377	376	ZigLLVM_Win32,
	377	ZigLLVM_ZOS,
378	378	ZigLLVM_Haiku,
379	379	ZigLLVM_Minix,
380	380	ZigLLVM_RTEMS,
381	381	ZigLLVM_NaCl, // Native Client
382		ZigLLVM_CNK, // BG/P Compute-Node Kernel
383	382	ZigLLVM_AIX,
384	383	ZigLLVM_CUDA, // NVIDIA CUDA
385	384	ZigLLVM_NVCL, // NVIDIA OpenCL
...	...	@@ -432,6 +431,7 @@ enum ZigLLVM_ObjectFormatType {
432	431
433	432	ZigLLVM_COFF,
434	433	ZigLLVM_ELF,
	434	ZigLLVM_GOFF,
435	435	ZigLLVM_MachO,
436	436	ZigLLVM_Wasm,
437	437	ZigLLVM_XCOFF,

author	Jakub Konka <kubkon@jakubkonka.com> 2020-12-16 17:54:49+01:00
committer	Jakub Konka <kubkon@jakubkonka.com> 2020-12-16 18:13:58+01:00
log	1c40a4df094132db952157bf28253ed80646ea00
tree	2aa86028c4a8ae0ccc324ad1e60b34891487e5d4
parent	6f3ed2f71f3548b399214f604d820cd2dd2887f3

Update zig_llvm.cpp and other bits