Rename some GC classes so that their roll will hopefully be clearer.

In particular, Collector was confusing to implementors. Several
thought that this compile-time class was the place to implement
their runtime GC heap. Of course, it doesn't even exist at runtime.
Specifically, the renames are:

  Collector               -> GCStrategy
  CollectorMetadata       -> GCFunctionInfo
  CollectorModuleMetadata -> GCModuleInfo
  CollectorRegistry       -> GCRegistry
  Function::getCollector  -> getGC (setGC, hasGC, clearGC)

Several accessors and nested types have also been renamed to be
consistent. These changes should be obvious.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@54899 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 6 insertions, 6 deletions

diff --git a/bindings/ocaml/llvm/llvm_ocaml.c b/bindings/ocaml/llvm/llvm_ocaml.c
index 94bd374594..f09d6cd91c 100644
--- a/bindings/ocaml/llvm/llvm_ocaml.c
+++ b/bindings/ocaml/llvm/llvm_ocaml.c
@@ -643,13 +643,13 @@ CAMLprim value llvm_set_function_call_conv(value Id, LLVMValueRef Fn) {
 }
 
 /* llvalue -> string option */
-CAMLprim value llvm_collector(LLVMValueRef Fn) {
-  const char *Collector;
+CAMLprim value llvm_gc(LLVMValueRef Fn) {
+  const char *GC;
   CAMLparam0();
   CAMLlocal2(Name, Option);
   
-  if ((Collector = LLVMGetCollector(Fn))) {
-    Name = copy_string(Collector);
+  if ((GC = LLVMGetGC(Fn))) {
+    Name = copy_string(GC);
     
     Option = alloc(1, 0);
     Field(Option, 0) = Name;
@@ -660,8 +660,8 @@ CAMLprim value llvm_collector(LLVMValueRef Fn) {
 }
 
 /* string option -> llvalue -> unit */
-CAMLprim value llvm_set_collector(value GC, LLVMValueRef Fn) {
-  LLVMSetCollector(Fn, GC == Val_int(0)? 0 : String_val(Field(GC, 0)));
+CAMLprim value llvm_set_gc(value GC, LLVMValueRef Fn) {
+  LLVMSetGC(Fn, GC == Val_int(0)? 0 : String_val(Field(GC, 0)));
   return Val_unit;
 }