Clang still refuses to play nice, so just ivars for this another way

2 files changed, 7 insertions, 6 deletions

diff --git a/Makefile b/Makefile
index cf456e8..f9c6efb 100644
--- a/Makefile
+++ b/Makefile
@@ -5,12 +5,11 @@ PACKAGE_VERSION := $(shell ./version.sh)
 include theos/makefiles/common.mk
 
 TWEAK_NAME := MobileSafety
-MobileSafety_CFLAGS := -Wno-return-stack-address
 MobileSafety_FILES := Tweak.xm
 MobileSafety_FRAMEWORKS := UIKit
 MobileSafety_OPTFLAG := -O2
 
-ADDITIONAL_CFLAGS += -Wno-error=tautological-undefined-compare -Wno-error=deprecated-declarations -Wno-error=return-stack-address
+ADDITIONAL_CFLAGS += -Wno-error=tautological-undefined-compare -Wno-error=deprecated-declarations
 #ADDITIONAL_LDFLAGS += -Xarch_armv6 -Wl,-lgcc_s.1
 
 #ADDITIONAL_LDFLAGS += -Xarch_armv6 -Wl,-segalign,4000 -Xarch_armv6 -ffixed-r9
diff --git a/Tweak.xm b/Tweak.xm
index 19d82b1..a8fa66c 100644
--- a/Tweak.xm
+++ b/Tweak.xm
@@ -29,10 +29,10 @@
 
 // Because compiler is optimizing out checks for dereferenced null pointers
 template <typename Type_>
-static inline Type_ &MYHookIvar(id self, const char *name) {
+static void MYHookIvar(id self, const char *name, Type_ *ivar_p) {
     Ivar ivar(class_getInstanceVariable(object_getClass(self), name));
     void *value = ivar == NULL ? NULL : *reinterpret_cast<void **>(reinterpret_cast<char *>(self) + ivar_getOffset(ivar));
-    return *(reinterpret_cast<Type_ *>(&value));
+    *ivar_p = reinterpret_cast<Type_>(value);
 }
 
 
@@ -334,8 +334,10 @@ static void AlertIfNeeded() {
 %hook SBUIController
 - (id) init {
     if ((self = %orig()) != nil) {
-        UIView *_contentLayer = MYHookIvar<UIView *>(self, "_contentLayer");
-        UIView *_contentView = MYHookIvar<UIView *>(self, "_contentView");
+        UIView *_contentLayer;
+        MYHookIvar<UIView *>(self, "_contentLayer", &_contentLayer);
+        UIView *_contentView;
+        MYHookIvar<UIView *>(self, "_contentView", &_contentView);
 
         UIView *layer;
         if (_contentLayer != NULL)