Mercurial > hg > graal-compiler
comparison src/os_cpu/linux_x86/vm/os_linux_x86.cpp @ 8124:5fc51c1ecdeb
Merge.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Tue, 05 Mar 2013 23:44:54 +0100 |
parents | 291ffc492eb6 12285410684f |
children | b8f261ba79c6 |
comparison
equal
deleted
inserted
replaced
7943:a413bcd552a4 | 8124:5fc51c1ecdeb |
---|---|
187 frame myframe((intptr_t*)os::current_stack_pointer(), | 187 frame myframe((intptr_t*)os::current_stack_pointer(), |
188 (intptr_t*)fp, | 188 (intptr_t*)fp, |
189 CAST_FROM_FN_PTR(address, os::current_frame)); | 189 CAST_FROM_FN_PTR(address, os::current_frame)); |
190 if (os::is_first_C_frame(&myframe)) { | 190 if (os::is_first_C_frame(&myframe)) { |
191 // stack is not walkable | 191 // stack is not walkable |
192 return frame(NULL, NULL, NULL); | 192 return frame(); |
193 } else { | 193 } else { |
194 return os::get_sender_for_C_frame(&myframe); | 194 return os::get_sender_for_C_frame(&myframe); |
195 } | 195 } |
196 } | 196 } |
197 | 197 |