From b31501c90abcea74c03e86a3bd9f6190cb4e1ddd Mon Sep 17 00:00:00 2001
From: "Feng, YunhuaX"
 </o=Intel/ou=Exchange Administrative Group (FYDIBOHF23SPDLT)/cn=Recipients/cn=Feng, YunhuaX4e1>
Date: Fri, 9 Mar 2018 16:46:00 +0800
Subject: [PATCH] BaseTools: Fix parse OFFSET_OF get wrong offset

Fix parse OFFSET_OF get wrong offset

Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yunhua Feng <yunhuax.feng@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
---
 BaseTools/Source/Python/Common/Expression.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/BaseTools/Source/Python/Common/Expression.py b/BaseTools/Source/Python/Common/Expression.py
index 79dc83efc3..e76f09c367 100644
--- a/BaseTools/Source/Python/Common/Expression.py
+++ b/BaseTools/Source/Python/Common/Expression.py
@@ -909,8 +909,9 @@ class ValueExpressionEx(ValueExpression):
                         LabelOffset = 0
                         for Index, Item in enumerate(PcdValueList):
                             # compute byte offset of every LABEL
-                            Item = Item.strip()
                             LabelList = ReLabel.findall(Item)
+                            Item = ReLabel.sub('', Item)
+                            Item = Item.strip()
                             if LabelList:
                                 for Label in LabelList:
                                     if not IsValidCString(Label):
-- 
2.39.2