Commit 31b72da84a14cb3652b3b770ac64e367d021529b | zig

author	Andrew Kelley <andrew@ziglang.org> 2019-09-22 16:40:48-04:00
committer	Andrew Kelley <andrew@ziglang.org> 2019-09-22 16:40:48-04:00
log	31b72da84a14cb3652b3b770ac64e367d021529b
tree	f8804107a67c9a40af2fffc06b01780cb849c95e
parent	65b495af58bcd010b997d9036ee39808451ef76c
signature	Commit is signed but in an unrecognized format.

2 files changed, 9 insertions(+), 10 deletions(-)

src/util.cpp+1-8

...	...	@@ -18,17 +18,10 @@ void zig_panic(const char *format, ...) {
18	18	vfprintf(stderr, format, ap);
19	19	fflush(stderr);
20	20	va_end(ap);
21		stage2_panic(nullptr, 0);
	21	stage2_panic("", 0);
22	22	abort();
23	23	}
24	24
25		void assert(bool ok) {
26		if (!ok) {
27		const char *msg = "Assertion failed. This is a bug in the Zig compiler.";
28		stage2_panic(msg, strlen(msg));
29		}
30		}
31
32	25	uint32_t int_hash(int i) {
33	26	return (uint32_t)(i % UINT32_MAX);
34	27	}

src/util.hpp+8-2

...	...	@@ -43,15 +43,21 @@ ATTRIBUTE_NORETURN
43	43	ATTRIBUTE_PRINTF(1, 2)
44	44	void zig_panic(const char *format, ...);
45	45
	46	static inline void zig_assert(bool ok, const char file, int line, const char func) {
	47	if (!ok) {
	48	zig_panic("Assertion failed at %s:%d in %s. This is a bug in the Zig compiler.", file, line, func);
	49	}
	50	}
	51
46	52	#ifdef _WIN32
47	53	#define __func__ __FUNCTION__
48	54	#endif
49	55
50		#define zig_unreachable() zig_panic("unreachable: %s:%s:%d", __FILE__, __func__, __LINE__)
	56	#define zig_unreachable() zig_panic("Unreachable at %s:%d in %s. This is a bug in the Zig compiler.", __FILE__, __LINE__, __func__)
51	57
52	58	// Assertions in stage1 are always on, and they call zig @panic.
53	59	#undef assert
54		void assert(bool ok);
	60	#define assert(ok) zig_assert(ok, __FILE__, __LINE__, __func__)
55	61
56	62	#if defined(_MSC_VER)
57	63	static inline int clzll(unsigned long long mask) {