azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve compatibility with newer GCC+Clang, resolve some warnings

Browse Source
This commit is contained in:
Campbell Jones
2020-10-26 15:33:02 -04:00
committed by Stanislav Erokhin
parent 58855b9eff
commit 4c9bbe54d4
22 changed files with 112 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/runtime/src/legacymm/cpp/Memory.cpp
+35 -35
View File
@@ -3193,17 +3193,17 @@ bool TryAddHeapRef(const ObjHeader* object) {
return tryAddHeapRef(object);
}
void ReleaseHeapRefStrict(const ObjHeader* object) {
RUNTIME_NOTHROW void ReleaseHeapRefStrict(const ObjHeader* object) {
releaseHeapRef<true>(const_cast<ObjHeader*>(object));
}
void ReleaseHeapRefRelaxed(const ObjHeader* object) {
RUNTIME_NOTHROW void ReleaseHeapRefRelaxed(const ObjHeader* object) {
releaseHeapRef<false>(const_cast<ObjHeader*>(object));
}
void ReleaseHeapRefNoCollectStrict(const ObjHeader* object) {
RUNTIME_NOTHROW void ReleaseHeapRefNoCollectStrict(const ObjHeader* object) {
releaseHeapRef<true, /* CanCollect = */ false>(const_cast<ObjHeader*>(object));
}
void ReleaseHeapRefNoCollectRelaxed(const ObjHeader* object) {
RUNTIME_NOTHROW void ReleaseHeapRefNoCollectRelaxed(const ObjHeader* object) {
releaseHeapRef<false, /* CanCollect = */ false>(const_cast<ObjHeader*>(object));
}
@@ -3276,60 +3276,60 @@ OBJ_GETTER(InitSharedInstanceRelaxed,
RETURN_RESULT_OF(initSharedInstance<false>, location, typeInfo, ctor);
}
void SetStackRefStrict(ObjHeader** location, const ObjHeader* object) {
RUNTIME_NOTHROW void SetStackRefStrict(ObjHeader** location, const ObjHeader* object) {
setStackRef<true>(location, object);
}
void SetStackRefRelaxed(ObjHeader** location, const ObjHeader* object) {
RUNTIME_NOTHROW void SetStackRefRelaxed(ObjHeader** location, const ObjHeader* object) {
setStackRef<false>(location, object);
}
void SetHeapRefStrict(ObjHeader** location, const ObjHeader* object) {
RUNTIME_NOTHROW void SetHeapRefStrict(ObjHeader** location, const ObjHeader* object) {
setHeapRef<true>(location, object);
}
void SetHeapRefRelaxed(ObjHeader** location, const ObjHeader* object) {
RUNTIME_NOTHROW void SetHeapRefRelaxed(ObjHeader** location, const ObjHeader* object) {
setHeapRef<false>(location, object);
}
void ZeroHeapRef(ObjHeader** location) {
RUNTIME_NOTHROW void ZeroHeapRef(ObjHeader** location) {
zeroHeapRef(location);
}
void ZeroStackRefStrict(ObjHeader** location) {
RUNTIME_NOTHROW void ZeroStackRefStrict(ObjHeader** location) {
zeroStackRef<true>(location);
}
void ZeroStackRefRelaxed(ObjHeader** location) {
RUNTIME_NOTHROW void ZeroStackRefRelaxed(ObjHeader** location) {
zeroStackRef<false>(location);
}
void UpdateStackRefStrict(ObjHeader** location, const ObjHeader* object) {
RUNTIME_NOTHROW void UpdateStackRefStrict(ObjHeader** location, const ObjHeader* object) {
updateStackRef<true>(location, object);
}
void UpdateStackRefRelaxed(ObjHeader** location, const ObjHeader* object) {
RUNTIME_NOTHROW void UpdateStackRefRelaxed(ObjHeader** location, const ObjHeader* object) {
updateStackRef<false>(location, object);
}
void UpdateHeapRefStrict(ObjHeader** location, const ObjHeader* object) {
RUNTIME_NOTHROW void UpdateHeapRefStrict(ObjHeader** location, const ObjHeader* object) {
updateHeapRef<true>(location, object);
}
void UpdateHeapRefRelaxed(ObjHeader** location, const ObjHeader* object) {
RUNTIME_NOTHROW void UpdateHeapRefRelaxed(ObjHeader** location, const ObjHeader* object) {
updateHeapRef<false>(location, object);
}
void UpdateReturnRefStrict(ObjHeader** returnSlot, const ObjHeader* value) {
RUNTIME_NOTHROW void UpdateReturnRefStrict(ObjHeader** returnSlot, const ObjHeader* value) {
updateReturnRef<true>(returnSlot, value);
}
void UpdateReturnRefRelaxed(ObjHeader** returnSlot, const ObjHeader* value) {
RUNTIME_NOTHROW void UpdateReturnRefRelaxed(ObjHeader** returnSlot, const ObjHeader* value) {
updateReturnRef<false>(returnSlot, value);
}
void ZeroArrayRefs(ArrayHeader* array) {
RUNTIME_NOTHROW void ZeroArrayRefs(ArrayHeader* array) {
for (uint32_t index = 0; index < array->count_; ++index) {
ObjHeader** location = ArrayAddressOfElementAt(array, index);
zeroHeapRef(location);
}
}
void UpdateHeapRefIfNull(ObjHeader** location, const ObjHeader* object) {
RUNTIME_NOTHROW void UpdateHeapRefIfNull(ObjHeader** location, const ObjHeader* object) {
updateHeapRefIfNull(location, object);
}
@@ -3338,7 +3338,7 @@ OBJ_GETTER(SwapHeapRefLocked,
RETURN_RESULT_OF(swapHeapRefLocked, location, expectedValue, newValue, spinlock, cookie);
}
void SetHeapRefLocked(ObjHeader** location, ObjHeader* newValue, int32_t* spinlock, int32_t* cookie) {
RUNTIME_NOTHROW void SetHeapRefLocked(ObjHeader** location, ObjHeader* newValue, int32_t* spinlock, int32_t* cookie) {
setHeapRefLocked(location, newValue, spinlock, cookie);
}
@@ -3350,17 +3350,17 @@ OBJ_GETTER(ReadHeapRefNoLock, ObjHeader* object, KInt index) {
RETURN_RESULT_OF(readHeapRefNoLock, object, index);
}
void EnterFrameStrict(ObjHeader** start, int parameters, int count) {
RUNTIME_NOTHROW void EnterFrameStrict(ObjHeader** start, int parameters, int count) {
enterFrame<true>(start, parameters, count);
}
void EnterFrameRelaxed(ObjHeader** start, int parameters, int count) {
RUNTIME_NOTHROW void EnterFrameRelaxed(ObjHeader** start, int parameters, int count) {
enterFrame<false>(start, parameters, count);
}
void LeaveFrameStrict(ObjHeader** start, int parameters, int count) {
RUNTIME_NOTHROW void LeaveFrameStrict(ObjHeader** start, int parameters, int count) {
leaveFrame<true>(start, parameters, count);
}
void LeaveFrameRelaxed(ObjHeader** start, int parameters, int count) {
RUNTIME_NOTHROW void LeaveFrameRelaxed(ObjHeader** start, int parameters, int count) {
leaveFrame<false>(start, parameters, count);
}
@@ -3476,11 +3476,11 @@ OBJ_GETTER(Kotlin_native_internal_GC_findCycle, KRef, KRef root) {
#endif
}
KNativePtr CreateStablePointer(KRef any) {
RUNTIME_NOTHROW KNativePtr CreateStablePointer(KRef any) {
return createStablePointer(any);
}
void DisposeStablePointer(KNativePtr pointer) {
RUNTIME_NOTHROW void DisposeStablePointer(KNativePtr pointer) {
disposeStablePointer(pointer);
}
@@ -3492,7 +3492,7 @@ OBJ_GETTER(AdoptStablePointer, KNativePtr pointer) {
RETURN_RESULT_OF(adoptStablePointer, pointer);
}
bool ClearSubgraphReferences(ObjHeader* root, bool checked) {
RUNTIME_NOTHROW bool ClearSubgraphReferences(ObjHeader* root, bool checked) {
return clearSubgraphReferences(root, checked);
}
@@ -3509,7 +3509,7 @@ void MutationCheck(ObjHeader* obj) {
ThrowInvalidMutabilityException(obj);
}
void CheckLifetimesConstraint(ObjHeader* obj, ObjHeader* pointee) {
RUNTIME_NOTHROW void CheckLifetimesConstraint(ObjHeader* obj, ObjHeader* pointee) {
if (!obj->local() && pointee != nullptr && pointee->local()) {
konan::consolePrintf("Attempt to store a stack object %p into a heap object %p\n", pointee, obj);
konan::consolePrintf("This is a compiler bug, please report it to https://kotl.in/issue\n");
@@ -3525,7 +3525,7 @@ void Kotlin_Any_share(ObjHeader* obj) {
shareAny(obj);
}
void AddTLSRecord(MemoryState* memory, void** key, int size) {
RUNTIME_NOTHROW void AddTLSRecord(MemoryState* memory, void** key, int size) {
auto* tlsMap = memory->tlsMap;
auto it = tlsMap->find(key);
if (it != tlsMap->end()) {
@@ -3536,7 +3536,7 @@ void AddTLSRecord(MemoryState* memory, void** key, int size) {
tlsMap->emplace(key, std::make_pair(start, size));
}
void ClearTLSRecord(MemoryState* memory, void** key) {
RUNTIME_NOTHROW void ClearTLSRecord(MemoryState* memory, void** key) {
auto* tlsMap = memory->tlsMap;
auto it = tlsMap->find(key);
if (it != tlsMap->end()) {
@@ -3550,7 +3550,7 @@ void ClearTLSRecord(MemoryState* memory, void** key) {
}
}
KRef* LookupTLS(void** key, int index) {
RUNTIME_NOTHROW KRef* LookupTLS(void** key, int index) {
auto* state = memoryState;
auto* tlsMap = state->tlsMap;
// In many cases there is only one module, so this one element cache.
@@ -3567,19 +3567,19 @@ KRef* LookupTLS(void** key, int index) {
}
void GC_RegisterWorker(void* worker) {
RUNTIME_NOTHROW void GC_RegisterWorker(void* worker) {
#if USE_CYCLIC_GC
cyclicAddWorker(worker);
#endif // USE_CYCLIC_GC
}
void GC_UnregisterWorker(void* worker) {
RUNTIME_NOTHROW void GC_UnregisterWorker(void* worker) {
#if USE_CYCLIC_GC
cyclicRemoveWorker(worker, g_hasCyclicCollector);
#endif // USE_CYCLIC_GC
}
void GC_CollectorCallback(void* worker) {
RUNTIME_NOTHROW void GC_CollectorCallback(void* worker) {
#if USE_CYCLIC_GC
if (g_hasCyclicCollector)
cyclicCollectorCallback(worker);
@@ -3607,7 +3607,7 @@ bool Kotlin_Any_isShareable(KRef thiz) {
return thiz == nullptr || isShareable(containerFor(thiz));
}
void PerformFullGC() {
RUNTIME_NOTHROW void PerformFullGC() {
garbageCollect(::memoryState, true);
}
kotlin-native/runtime/src/main/kotlin/kotlin/Throwable.kt
+1 -1
View File
@@ -69,7 +69,7 @@ public open class Throwable(open val message: String?, open val cause: Throwable
println(this)
clear()
} else {
appendln()
appendLine()
}
}
kotlin-native/runtime/src/main/kotlin/kotlin/native/concurrent/Lazy.kt
+2 -3
View File
@@ -41,8 +41,7 @@ internal class FreezeAwareLazyImpl<out T>(initializer: () -> T) : Lazy<T> {
}
// Set value_ to actual one.
value_.value = result
@Suppress("UNCHECKED_CAST")
return result as T
return result
}
override val value: T
@@ -118,4 +117,4 @@ internal class AtomicLazyImpl<out T>(initializer: () -> T) : Lazy<T> {
* leak memory, so it is recommended to use `atomicLazy` in cases of objects living forever,
* such as object signletons, or in cases where it's guaranteed not to have cyclical garbage.
*/
public fun <T> atomicLazy(initializer: () -> T): Lazy<T> = AtomicLazyImpl(initializer)
public fun <T> atomicLazy(initializer: () -> T): Lazy<T> = AtomicLazyImpl(initializer)
kotlin-native/runtime/src/main/kotlin/kotlin/text/regex/Lexer.kt
+3 -3
View File
@@ -457,7 +457,7 @@ internal class Lexer(val patternString: String, flags: Int) {
// Word/whitespace/digit.
'w', 's', 'd', 'W', 'S', 'D' -> {
lookAheadSpecialToken = AbstractCharClass.getPredefinedClass(
String(pattern, prevNonWhitespaceIndex, 1),
pattern.concatToString(prevNonWhitespaceIndex, prevNonWhitespaceIndex + 1),
false
)
lookAhead = 0
@@ -724,12 +724,12 @@ internal class Lexer(val patternString: String, flags: Int) {
val CHAR_PREVIOUS_MATCH = 0x80000000.toInt() or 'G'.toInt()
val CHAR_END_OF_INPUT = 0x80000000.toInt() or 'z'.toInt()
val CHAR_END_OF_LINE = 0x80000000.toInt() or 'Z'.toInt()
// Quantifier modes.
val QMOD_GREEDY = 0xe0000000.toInt()
val QMOD_RELUCTANT = 0xc0000000.toInt()
val QMOD_POSSESSIVE = 0x80000000.toInt()
// Quantifiers.
val QUANT_STAR = QMOD_GREEDY or '*'.toInt()
val QUANT_STAR_P = QMOD_POSSESSIVE or '*'.toInt()
kotlin-native/runtime/src/main/kotlin/kotlin/text/regex/Pattern.kt
+1 -1
View File
@@ -794,7 +794,7 @@ internal class Pattern(val pattern: String, flags: Int = 0) {
val isSupplCodePoint = Char.isSupplementaryCodePoint(ch)
return when {
isSupplCodePoint -> SequenceSet(String(Char.toChars(ch), 0, 2), hasFlag(CASE_INSENSITIVE))
isSupplCodePoint -> SequenceSet(Char.toChars(ch).concatToString(0, 2), hasFlag(CASE_INSENSITIVE))
ch.toChar().isLowSurrogate() -> LowSurrogateCharSet(ch.toChar())
ch.toChar().isHighSurrogate() -> HighSurrogateCharSet(ch.toChar())
else -> CharSet(ch.toChar(), hasFlag(CASE_INSENSITIVE))
kotlin-native/runtime/src/main/kotlin/kotlin/text/regex/sets/FSets.kt
+2 -2
View File
@@ -67,7 +67,7 @@ open internal class FSet(val groupIndex: Int) : SimpleSet() {
}
companion object {
var possessiveFSet = PossessiveFSet()
val possessiveFSet = PossessiveFSet()
}
}
@@ -156,4 +156,4 @@ internal class AtomicFSet(groupIndex: Int) : FSet(groupIndex) {
override fun hasConsumed(matchResult: MatchResultImpl): Boolean {
return false
}
}
}
kotlin-native/runtime/src/main/kotlin/kotlin/text/regex/sets/HangulDecomposedCharSet.kt
+1 -1
View File
@@ -43,7 +43,7 @@ internal class HangulDecomposedCharSet(
* String representing syllable
*/
private val decomposedCharUTF16: String by lazy {
String(decomposedChar, 0, decomposedChar.size)
decomposedChar.concatToString(0, decomposedChar.size)
}
override val name: String
kotlin-native/runtime/src/main/kotlin/kotlin/text/regex/sets/SupplementaryCharSet.kt
+1 -1
View File
@@ -91,7 +91,7 @@ package kotlin.text.regex
* Represents node accepting single supplementary codepoint.
*/
internal class SupplementaryCharSet(val codePoint: Int, ignoreCase: Boolean)
: SequenceSet(String(Char.toChars(codePoint), 0, 2), ignoreCase) {
: SequenceSet(Char.toChars(codePoint).concatToString(0, 2), ignoreCase) {
override val name: String
get() = patternString
kotlin-native/runtime/src/relaxed/cpp/MemoryImpl.cpp
+10 -10
View File
@@ -29,43 +29,43 @@ OBJ_GETTER(InitSharedInstance,
RETURN_RESULT_OF(InitSharedInstanceRelaxed, location, typeInfo, ctor);
}
void ReleaseHeapRef(const ObjHeader* object) {
RUNTIME_NOTHROW void ReleaseHeapRef(const ObjHeader* object) {
ReleaseHeapRefRelaxed(object);
}
void ReleaseHeapRefNoCollect(const ObjHeader* object) {
RUNTIME_NOTHROW void ReleaseHeapRefNoCollect(const ObjHeader* object) {
ReleaseHeapRefNoCollectRelaxed(object);
}
void ZeroStackRef(ObjHeader** location) {
RUNTIME_NOTHROW void ZeroStackRef(ObjHeader** location) {
ZeroStackRefRelaxed(location);
}
void SetStackRef(ObjHeader** location, const ObjHeader* object) {
RUNTIME_NOTHROW void SetStackRef(ObjHeader** location, const ObjHeader* object) {
SetStackRefRelaxed(location, object);
}
void SetHeapRef(ObjHeader** location, const ObjHeader* object) {
RUNTIME_NOTHROW void SetHeapRef(ObjHeader** location, const ObjHeader* object) {
SetHeapRefRelaxed(location, object);
}
void UpdateHeapRef(ObjHeader** location, const ObjHeader* object) {
RUNTIME_NOTHROW void UpdateHeapRef(ObjHeader** location, const ObjHeader* object) {
UpdateHeapRefRelaxed(location, object);
}
void UpdateReturnRef(ObjHeader** returnSlot, const ObjHeader* object) {
RUNTIME_NOTHROW void UpdateReturnRef(ObjHeader** returnSlot, const ObjHeader* object) {
UpdateReturnRefRelaxed(returnSlot, object);
}
void EnterFrame(ObjHeader** start, int parameters, int count) {
RUNTIME_NOTHROW void EnterFrame(ObjHeader** start, int parameters, int count) {
EnterFrameRelaxed(start, parameters, count);
}
void LeaveFrame(ObjHeader** start, int parameters, int count) {
RUNTIME_NOTHROW void LeaveFrame(ObjHeader** start, int parameters, int count) {
LeaveFrameRelaxed(start, parameters, count);
}
void UpdateStackRef(ObjHeader** location, const ObjHeader* object) {
RUNTIME_NOTHROW void UpdateStackRef(ObjHeader** location, const ObjHeader* object) {
UpdateStackRefRelaxed(location, object);
}
kotlin-native/runtime/src/strict/cpp/MemoryImpl.cpp
+10 -10
View File
@@ -29,43 +29,43 @@ OBJ_GETTER(InitSharedInstance,
RETURN_RESULT_OF(InitSharedInstanceStrict, location, typeInfo, ctor);
}
void ReleaseHeapRef(const ObjHeader* object) {
RUNTIME_NOTHROW void ReleaseHeapRef(const ObjHeader* object) {
ReleaseHeapRefStrict(object);
}
void ReleaseHeapRefNoCollect(const ObjHeader* object) {
RUNTIME_NOTHROW void ReleaseHeapRefNoCollect(const ObjHeader* object) {
ReleaseHeapRefNoCollectStrict(object);
}
void SetStackRef(ObjHeader** location, const ObjHeader* object) {
RUNTIME_NOTHROW void SetStackRef(ObjHeader** location, const ObjHeader* object) {
SetStackRefStrict(location, object);
}
void SetHeapRef(ObjHeader** location, const ObjHeader* object) {
RUNTIME_NOTHROW void SetHeapRef(ObjHeader** location, const ObjHeader* object) {
SetHeapRefStrict(location, object);
}
void ZeroStackRef(ObjHeader** location) {
RUNTIME_NOTHROW void ZeroStackRef(ObjHeader** location) {
ZeroStackRefStrict(location);
}
void UpdateHeapRef(ObjHeader** location, const ObjHeader* object) {
RUNTIME_NOTHROW void UpdateHeapRef(ObjHeader** location, const ObjHeader* object) {
UpdateHeapRefStrict(location, object);
}
void UpdateReturnRef(ObjHeader** returnSlot, const ObjHeader* object) {
RUNTIME_NOTHROW void UpdateReturnRef(ObjHeader** returnSlot, const ObjHeader* object) {
UpdateReturnRefStrict(returnSlot, object);
}
void EnterFrame(ObjHeader** start, int parameters, int count) {
RUNTIME_NOTHROW void EnterFrame(ObjHeader** start, int parameters, int count) {
EnterFrameStrict(start, parameters, count);
}
void LeaveFrame(ObjHeader** start, int parameters, int count) {
RUNTIME_NOTHROW void LeaveFrame(ObjHeader** start, int parameters, int count) {
LeaveFrameStrict(start, parameters, count);
}
void UpdateStackRef(ObjHeader** location, const ObjHeader* object) {
RUNTIME_NOTHROW void UpdateStackRef(ObjHeader** location, const ObjHeader* object) {
UpdateStackRefStrict(location, object);
}