summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author이형주/Common Platform Lab(SR)/삼성전자 <leee.lee@samsung.com>2022-02-24 13:41:19 +0900
committerGitHub Enterprise <noreply-CODE@samsung.com>2022-02-24 13:41:19 +0900
commitce69ffb191f73626c5b5a87f72c919349e925d3a (patch)
tree957eb464152b3fe28aa985d3cba3624e36f305c5
parentc9d19a35b19cfc708ed61eaaec470052baa79c57 (diff)
downloadcoreclr-tizen.tar.gz
coreclr-tizen.tar.bz2
coreclr-tizen.zip
[Tizen] build fix for clang-10 (#331)submit/tizen/20220224.044249tizen
-rw-r--r--src/inc/slist.h6
-rw-r--r--src/pal/inc/pal.h2
-rw-r--r--src/tools/metainfo/mdinfo.cpp10
-rw-r--r--src/vm/object.inl4
4 files changed, 11 insertions, 11 deletions
diff --git a/src/inc/slist.h b/src/inc/slist.h
index f05d763dc6..abebe04d47 100644
--- a/src/inc/slist.h
+++ b/src/inc/slist.h
@@ -160,13 +160,13 @@ public:
void Init()
{
LIMITED_METHOD_CONTRACT;
- m_pHead = &m_link;
+ m_pHead = PTR_SLink(&m_link);
// NOTE :: fHead variable is template argument
// the following code is a compiled in, only if the fHead flag
// is set to false,
if (!fHead)
{
- m_pTail = &m_link;
+ m_pTail = PTR_SLink(&m_link);
}
}
@@ -274,7 +274,7 @@ public:
SLink *ret = SLink::FindAndRemove(m_pHead, GetLink(pObj), &prior);
if (ret == m_pTail)
- m_pTail = prior;
+ m_pTail = PTR_SLink(prior);
return GetObject(ret);
}
diff --git a/src/pal/inc/pal.h b/src/pal/inc/pal.h
index 9d05d73530..c04dfbaf97 100644
--- a/src/pal/inc/pal.h
+++ b/src/pal/inc/pal.h
@@ -145,7 +145,7 @@ typedef PVOID NATIVE_LIBRARY_HANDLE;
/******************* Compiler-specific glue *******************************/
#ifndef THROW_DECL
-#if defined(_MSC_VER) || defined(__llvm__) || !defined(__cplusplus)
+#if defined(_MSC_VER) || !defined(__cplusplus)
#define THROW_DECL
#else
#define THROW_DECL throw()
diff --git a/src/tools/metainfo/mdinfo.cpp b/src/tools/metainfo/mdinfo.cpp
index 5458a76d28..a716189b8d 100644
--- a/src/tools/metainfo/mdinfo.cpp
+++ b/src/tools/metainfo/mdinfo.cpp
@@ -1948,11 +1948,11 @@ void MDInfo::DisplayCustomAttributeInfo(mdCustomAttribute inValue, const char *p
VWrite(" :: %S", qSigName.Ptr());
// Keep track of coff overhead.
- if (!wcscmp(W("__DecoratedName"), rcName))
- {
- bCoffSymbol = true;
- g_cbCoffNames += cbValue + 6;
- }
+ if (!wcscmp(W("__DecoratedName"), rcName))
+ {
+ bCoffSymbol = true;
+ g_cbCoffNames += cbValue + 6;
+ }
WriteLine("");
VWriteLine("%s\tLength: %ld", preFix, cbValue);
diff --git a/src/vm/object.inl b/src/vm/object.inl
index 64cf9ed4dd..ff60a7808a 100644
--- a/src/vm/object.inl
+++ b/src/vm/object.inl
@@ -293,7 +293,7 @@ __forceinline BOOL Nullable::IsNullableForType(TypeHandle type, MethodTable* par
return FALSE;
if (!type.AsMethodTable()->HasInstantiation()) // shortcut, if it is not generic it can't be Nullable<T>
return FALSE;
- return Nullable::IsNullableForTypeHelper(type.AsMethodTable(), paramMT);
+ return Nullable::IsNullableForTypeHelper(type.AsMethodTable(), paramMT);
}
//===============================================================================
@@ -305,7 +305,7 @@ __forceinline BOOL Nullable::IsNullableForTypeNoGC(TypeHandle type, MethodTable*
return FALSE;
if (!type.AsMethodTable()->HasInstantiation()) // shortcut, if it is not generic it can't be Nullable<T>
return FALSE;
- return Nullable::IsNullableForTypeHelperNoGC(type.AsMethodTable(), paramMT);
+ return Nullable::IsNullableForTypeHelperNoGC(type.AsMethodTable(), paramMT);
}
//===============================================================================