From a9ccee0a1c4b876f1e990f601ae59f27740611e3 Mon Sep 17 00:00:00 2001
From: Santosh Puranik <santosh.puranik@in.ibm.com>
Date: Mon, 28 Nov 2016 00:31:55 -0600
Subject: Disable FAPI_TRY for attribute accesses

Change-Id: Ie69e7bb2a91d477077b74391bb434539af03b31b
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/33019
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Shakeeb A. Pasha B K <shakeebbk@in.ibm.com>
Reviewed-by: Gregory S. Still <stillgs@us.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Reviewed-by: AMIT J. TENDOLKAR <amit.tendolkar@in.ibm.com>
---
 src/hwpf/include/plat/plat_error_scope.H | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'src/hwpf/include')

diff --git a/src/hwpf/include/plat/plat_error_scope.H b/src/hwpf/include/plat/plat_error_scope.H
index ff03769d..bc5ad9f5 100644
--- a/src/hwpf/include/plat/plat_error_scope.H
+++ b/src/hwpf/include/plat/plat_error_scope.H
@@ -32,11 +32,19 @@
 
 /// @cond
 #define PLAT_FAPI_TRY_NO_TRACE( __operation__ )                         \
+    if(std::is_same<decltype((__operation__)), fapi2::AttributeRC>::value)                     \
+    { \
+        (void)((__operation__)); \
+    } \
+    else \
+    { \
     if ((fapi2::current_err = (__operation__)) != fapi2::FAPI2_RC_SUCCESS) \
     {                                                                   \
         goto fapi_try_exit;                                             \
+    } \
     }
 
+
 #define PLAT_FAPI_TRY_TRACE( __operation__, ... )                       \
     if ((fapi2::current_err = (__operation__)) != fapi2::FAPI2_RC_SUCCESS) \
     {                                                                   \
@@ -59,8 +67,8 @@
         FAPI_ERR(__VA_ARGS__);                                  \
         goto fapi_try_exit;                                     \
     }
-    
-    
+
+
 ///
 /// @brief Temporary macro for error label until all are removed.
 /// @todo REMOVE this in time.
-- 
cgit v1.2.1