---

brson · graydon · commit 77230d835547 · 2011-12-12T16:14:17.000-08:00
yaml --- r: 6656 b: refs/heads/master c: 3e32f66 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e47f8fc709763581ec2ce4ea052b50cb89a9c4d7
+refs/heads/master: 3e32f6623cf89375ad5e07778da614d2b6300778
diff --git a/trunk/src/rt/arch/x86_64/morestack.S b/trunk/src/rt/arch/x86_64/morestack.S
@@ -71,6 +71,20 @@ MORESTACK:
 	leaq 16(%rbp), %rax
 	pushq %rax
 
+	// During unwinding we want to skip our caller since it's not
+	// a complete frame and will make the unwinder sad
+#if defined(__linux__)
+	// Don't understand this line
+	.cfi_offset 16, 0
+	// Tell the unwinding where to get the stack pointer for
+	// our grandparent frame
+	.cfi_offset %rsp, -24
+#endif
+
+	// Save the grandparent stack pointer for the unwinder
+	leaq 16(%rbp), %rax
+	pushq %rax
+
 	// FIXME: libgcc also saves rax. not sure if we need to
 
 	// Save argument registers

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`---`
`2`		`-refs/heads/master: e47f8fc709763581ec2ce4ea052b50cb89a9c4d7`
	`2`	`+refs/heads/master: 3e32f6623cf89375ad5e07778da614d2b6300778`