aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--vm.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c61b6bb811..eddef08466 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jan 10 15:31:55 2012 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * vm.c (vm_exec): refix r34162; suppress warning and add description.
+
Tue Jan 10 15:13:58 2012 NARUSE, Yui <naruse@ruby-lang.org>
* ext/readline/readline.c (readline_attempted_completion_function):
diff --git a/vm.c b/vm.c
index 90f7e3e519..71d282d579 100644
--- a/vm.c
+++ b/vm.c
@@ -1216,8 +1216,8 @@ vm_exec(rb_thread_t *th)
vm_loop_start:
result = vm_exec_core(th, initial);
if ((state = th->state) != 0) {
-#ifdef __llvm__
- rb_thread_t t = *th;
+#ifdef __llvm__ /* LLVM optimization guard for TestEnumerator#test_nested_itaration */
+ (void)__extension__({rb_thread_t t = *th; t;});
#endif
err = result;
th->state = 0;