THGeneral.h.in: add generic cleanup mechanism for error macros that d…

…o not return
Onurakdeniz · Feb 11, 2016 · bb0c3fb · bb0c3fb
1 parent b33ac90
commit bb0c3fb
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/lib/TH/THGeneral.h.in b/lib/TH/THGeneral.h.in
@@ -57,13 +57,27 @@ TH_API void THSetGCHandler( void (*torchGCHandlerFunction)(void *data), void *da
 TH_API void THHeapUpdate(long size);
 
 #define THError(...) _THError(__FILE__, __LINE__, __VA_ARGS__)
-#define THArgCheck(...) _THArgCheck(__FILE__, __LINE__, __VA_ARGS__)
+
+#define THCleanup(...) __VA_ARGS__
+
+#define THArgCheck(...) \
+do { \
+ _THArgCheck(__FILE__, __LINE__, __VA_ARGS__); \
+} while(0)
+
+#define THArgCheckWithCleanup(condition, cleanup, ...) \
+do if (!(condition)) { \
+ cleanup \
+ _THArgCheck(__FILE__, __LINE__, 0, __VA_ARGS__); \
+} while(0)
+
 #define THAssert(exp) \
 do { \
  if (!(exp)) { \
  _THAssertionFailed(__FILE__, __LINE__, #exp, ""); \
  } \
 } while(0)
+
 #define THAssertMsg(exp, ...) \
 do { \
  if (!(exp)) { \