diff options
| author | Zoltan Varga <vargaz@gmail.com> | 2018-10-08 18:06:05 +0300 |
|---|---|---|
| committer | Ludovic Henry <luhenry@microsoft.com> | 2018-10-08 18:06:05 +0300 |
| commit | c7c89f2155f80a9bb3f04e5e14df06066ba5f04e (patch) | |
| tree | 62a9615e6b7dab1735deead807f9bdc87b99ee0b | |
| parent | b7c18caf0c758d2d81f0d83224d031073e4e5618 (diff) | |
[llvm] Fix the loaded llvm build. (#11014)
| -rw-r--r-- | mono/metadata/marshal.h | 2 | ||||
| -rw-r--r-- | mono/mini/mini-llvm.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mono/metadata/marshal.h b/mono/metadata/marshal.h index 9f2bcd02cfb..3c0abaddf1d 100644 --- a/mono/metadata/marshal.h +++ b/mono/metadata/marshal.h @@ -401,7 +401,7 @@ void mono_marshal_set_wrapper_info (MonoMethod *method, WrapperInfo *info); WrapperInfo* -mono_marshal_get_wrapper_info (MonoMethod *wrapper); +mono_marshal_get_wrapper_info (MonoMethod *wrapper) MONO_LLVM_INTERNAL; MonoMethod * mono_marshal_get_delegate_begin_invoke (MonoMethod *method); diff --git a/mono/mini/mini-llvm.c b/mono/mini/mini-llvm.c index 71338a17897..2a6c67f548e 100644 --- a/mono/mini/mini-llvm.c +++ b/mono/mini/mini-llvm.c @@ -3236,7 +3236,7 @@ needs_extra_arg (EmitContext *ctx, MonoMethod *method) return FALSE; /* These are called from gsharedvt code with an indirect call which doesn't pass an extra arg */ - if (method->klass == mono_defaults.string_class && (strstr (method->name, "memcpy") || strstr (method->name, "bzero"))) + if (method->klass == mono_get_string_class () && (strstr (method->name, "memcpy") || strstr (method->name, "bzero"))) return FALSE; return TRUE; } |