[PATCH] MdePkg DebugLib: Enable FILE NAME as DEBUG ASSERT for CLANG

[PATCH] MdePkg DebugLib: Enable FILE NAME as DEBUG ASSERT for CLANG

[Zhiguang Liu]

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1548
This change will make the generated image not include the absolute file path.
If so, the generated debug image can be reproduced in the different root
directory. Also, it will reduce the size of debug image size.

CC: Michael D Kinney <michael.d.kinney@intel.com>
CC: Liming Gao <liming.gao@intel.com>
Signed-off-by: Zhiguang Liu <zhiguang.liu@intel.com>
---
 MdePkg/Include/Library/DebugLib.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/MdePkg/Include/Library/DebugLib.h b/MdePkg/Include/Library/DebugLib.h
index f1d55cf62b..baab34bf05 100644
--- a/MdePkg/Include/Library/DebugLib.h
+++ b/MdePkg/Include/Library/DebugLib.h
@@ -8,7 +8,7 @@
   of size reduction when compiler optimization is disabled. If MDEPKG_NDEBUG is
   defined, then debug and assert related macros wrapped by it are the NULL implementations.
 
-Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2020, Intel Corporation. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
@@ -289,7 +289,11 @@ DebugPrintLevelEnabled (
   @param  Expression  Boolean expression that evaluated to FALSE
 
 **/
+#if defined(__clang__) && defined(__FILE_NAME__)
+#define _ASSERT(Expression)  DebugAssert (__FILE_NAME__, __LINE__, #Expression)
+#else
 #define _ASSERT(Expression)  DebugAssert (__FILE__, __LINE__, #Expression)
+#endif
 
 
 /**
-- 
2.25.1.windows.1

Re: [PATCH] MdePkg DebugLib: Enable FILE NAME as DEBUG ASSERT for CLANG

[Liming Gao]

Zhiguang:
  Please add more information on macro __FILE_NAME__. This is new macro supported by CLANG compiler. 

Thanks
Liming
-----Original Message-----
From: Liu, Zhiguang <zhiguang.liu@intel.com> 
Sent: 2020年3月17日 15:13
To: devel@edk2.groups.io
Cc: Kinney, Michael D <michael.d.kinney@intel.com>; Gao, Liming <liming.gao@intel.com>
Subject: [PATCH] MdePkg DebugLib: Enable FILE NAME as DEBUG ASSERT for CLANG

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1548
This change will make the generated image not include the absolute file path.
If so, the generated debug image can be reproduced in the different root directory. Also, it will reduce the size of debug image size.

CC: Michael D Kinney <michael.d.kinney@intel.com>
CC: Liming Gao <liming.gao@intel.com>
Signed-off-by: Zhiguang Liu <zhiguang.liu@intel.com>
---
 MdePkg/Include/Library/DebugLib.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/MdePkg/Include/Library/DebugLib.h b/MdePkg/Include/Library/DebugLib.h
index f1d55cf62b..baab34bf05 100644
--- a/MdePkg/Include/Library/DebugLib.h
+++ b/MdePkg/Include/Library/DebugLib.h
@@ -8,7 +8,7 @@
   of size reduction when compiler optimization is disabled. If MDEPKG_NDEBUG is   defined, then debug and assert related macros wrapped by it are the NULL implementations. -Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>+Copyright (c) 2006 - 2020, Intel Corporation. All rights reserved.<BR> SPDX-License-Identifier: BSD-2-Clause-Patent  **/@@ -289,7 +289,11 @@ DebugPrintLevelEnabled (
   @param  Expression  Boolean expression that evaluated to FALSE  **/+#if defined(__clang__) && defined(__FILE_NAME__)+#define _ASSERT(Expression)  DebugAssert (__FILE_NAME__, __LINE__, #Expression)+#else #define _ASSERT(Expression)  DebugAssert (__FILE__, __LINE__, #Expression)+#endif   /**-- 
2.25.1.windows.1