atomics: fix some minor issues (#42335)

vtjnash · KristofferC · commit 0904a1266a7d · 2021-09-23T13:18:12.000+02:00
(cherry picked from commit 1e6c269)
diff --git a/Make.inc b/Make.inc
@@ -1302,7 +1302,7 @@ ifeq ($(OS), WINNT)
 ifneq ($(USEMSVC), 1)
 HAVE_SSP := 1
 OSLIBS += -Wl,--export-all-symbols -Wl,--version-script=$(JULIAHOME)/src/julia.expmap \
-	$(NO_WHOLE_ARCHIVE) -lpsapi -lkernel32 -lws2_32 -liphlpapi -lwinmm -ldbghelp -luserenv -lsecur32
+	$(NO_WHOLE_ARCHIVE) -lpsapi -lkernel32 -lws2_32 -liphlpapi -lwinmm -ldbghelp -luserenv -lsecur32 -latomic
 JLDFLAGS := -Wl,--stack,8388608
 ifeq ($(ARCH),i686)
 JLDFLAGS += -Wl,--large-address-aware
diff --git a/src/cgutils.cpp b/src/cgutils.cpp
@@ -1560,7 +1560,7 @@ static jl_cgval_t typed_store(jl_codectx_t &ctx,
             ret = mark_julia_type(ctx, callval, true, jl_any_type);
         }
         if (!jl_subtype(ret.typ, jltype)) {
-            emit_typecheck(ctx, ret, jltype, fname + "typed_store");
+            emit_typecheck(ctx, ret, jltype, fname);
             ret = update_julia_type(ctx, ret, jltype);
         }
         return ret;

Original file line number	Diff line number	Diff line change
`@@ -1560,7 +1560,7 @@ static jl_cgval_t typed_store(jl_codectx_t &ctx,`
`1560`	`1560`	`ret = mark_julia_type(ctx, callval, true, jl_any_type);`
`1561`	`1561`	`}`
`1562`	`1562`	`if (!jl_subtype(ret.typ, jltype)) {`
`1563`		`- emit_typecheck(ctx, ret, jltype, fname + "typed_store");`
	`1563`	`+ emit_typecheck(ctx, ret, jltype, fname);`
`1564`	`1564`	`ret = update_julia_type(ctx, ret, jltype);`
`1565`	`1565`	`}`
`1566`	`1566`	`return ret;`