From: Xinchen Hui <laruence@php.net>
Date: Tue, 28 Jul 2015 03:06:52 +0000 (+0800)
Subject: Attempt to fix bug35437.phpt fails
X-Git-Tag: php-7.0.0beta3~5^2~89
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=16d6dfddef5ac43de3b20ffa7818d5b11f4e6a4b;p=php

Attempt to fix bug35437.phpt fails
---

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index ce5d520aa2..9273333117 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -3096,8 +3096,8 @@ ZEND_VM_HANDLER(113, ZEND_INIT_STATIC_METHOD_CALL, CONST|VAR, CONST|TMPVAR|UNUSE
 					zend_ce_error,
 					"Non-static method %s::%s() cannot be called statically",
 					ZSTR_VAL(fbc->common.scope->name), ZSTR_VAL(fbc->common.function_name));
-				HANDLE_EXCEPTION();
 			}
+			HANDLE_EXCEPTION();
 		}
 	}
 
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index da2eeada13..3f800b120d 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -5663,8 +5663,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_C
 					zend_ce_error,
 					"Non-static method %s::%s() cannot be called statically",
 					ZSTR_VAL(fbc->common.scope->name), ZSTR_VAL(fbc->common.function_name));
-				HANDLE_EXCEPTION();
 			}
+			HANDLE_EXCEPTION();
 		}
 	}