Merge branch 'master' of https://github.com/odin-lang/Odin

2 files changed, 7 insertions, 3 deletions

diff --git a/core/os/os2/file_windows.odin b/core/os/os2/file_windows.odin
index 40d012183..dbac78d0e 100644
--- a/core/os/os2/file_windows.odin
+++ b/core/os/os2/file_windows.odin
@@ -249,9 +249,9 @@ _destroy :: proc(f: ^File_Impl) -> Error {
 	a := f.allocator
 	err0 := free(f.wname, a)
 	err1 := delete(f.name, a)
-	err2 := free(f, a)
-	err3 := delete(f.r_buf, a)
-	err4 := delete(f.w_buf, a)
+	err2 := delete(f.r_buf, a)
+	err3 := delete(f.w_buf, a)
+	err4 := free(f, a)
 	err0 or_return
 	err1 or_return
 	err2 or_return
diff --git a/core/prof/spall/spall.odin b/core/prof/spall/spall.odin
index 16b809359..dc53dc3dc 100644
--- a/core/prof/spall/spall.odin
+++ b/core/prof/spall/spall.odin
@@ -103,6 +103,7 @@ context_create_with_sleep :: proc(filename: string, sleep := 2 * time.Second) ->
 
 context_create :: proc{context_create_with_scale, context_create_with_sleep}
 
+@(no_instrumentation)
 context_destroy :: proc(ctx: ^Context) {
 	if ctx == nil {
 		return
@@ -146,6 +147,7 @@ buffer_flush :: proc "contextless" (ctx: ^Context, buffer: ^Buffer) #no_bounds_c
 	buffer.first_ts = end
 }
 
+@(no_instrumentation)
 buffer_destroy :: proc(ctx: ^Context, buffer: ^Buffer) {
 	buffer_flush(ctx, buffer)
 
@@ -155,12 +157,14 @@ buffer_destroy :: proc(ctx: ^Context, buffer: ^Buffer) {
 
 
 @(deferred_in=_scoped_buffer_end)
+@(no_instrumentation)
 SCOPED_EVENT :: proc(ctx: ^Context, buffer: ^Buffer, name: string, args: string = "", location := #caller_location) -> bool {
 	_buffer_begin(ctx, buffer, name, args, location)
 	return true
 }
 
 @(private)
+@(no_instrumentation)
 _scoped_buffer_end :: proc(ctx: ^Context, buffer: ^Buffer, _, _: string, _ := #caller_location) {
 	_buffer_end(ctx, buffer)
 }