From df2cfac07f9ccf2f3708cfdd692a85fbdd1a199c Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Mon, 27 Jun 2011 16:09:28 -0700
Subject: [PATCH] Move what's left of metadata::cwriter into middle::trans

---
 src/comp/back/link.rs        |  1 -
 src/comp/metadata/cwriter.rs | 10 ----------
 src/comp/middle/trans.rs     | 19 +++++++++++++++++--
 src/comp/middle/ty.rs        |  1 -
 src/comp/rustc.rc            |  1 -
 5 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/comp/back/link.rs b/src/comp/back/link.rs
index afea8b85e8a..e317ade1660 100644
--- a/src/comp/back/link.rs
+++ b/src/comp/back/link.rs
@@ -3,7 +3,6 @@ import driver::session;
 import lib::llvm::llvm;
 import middle::trans;
 import middle::ty;
-import metadata::cwriter;
 import std::str;
 import std::fs;
 import std::vec;
diff --git a/src/comp/metadata/cwriter.rs b/src/comp/metadata/cwriter.rs
index eedf973fdbb..9956a46c828 100644
--- a/src/comp/metadata/cwriter.rs
+++ b/src/comp/metadata/cwriter.rs
@@ -15,16 +15,6 @@ fn C_postr(&str s) -> ValueRef {
     ret llvm::LLVMConstString(str::buf(s), str::byte_len(s), False);
 }
 
-fn write_metadata(&@trans::crate_ctxt cx, &@crate crate) {
-    if (!cx.sess.get_opts().shared) { ret; }
-    auto llmeta = C_postr(encoder::encode_metadata(cx, crate));
-    auto llconst = trans::C_struct([llmeta]);
-    auto llglobal =
-        llvm::LLVMAddGlobal(cx.llmod, trans::val_ty(llconst),
-                            str::buf("rust_metadata"));
-    llvm::LLVMSetInitializer(llglobal, llconst);
-    llvm::LLVMSetSection(llglobal, str::buf(x86::get_meta_sect_name()));
-}
 
 //
 // Local Variables:
diff --git a/src/comp/middle/trans.rs b/src/comp/middle/trans.rs
index 9c71ade709c..2025c6e0e8b 100644
--- a/src/comp/middle/trans.rs
+++ b/src/comp/middle/trans.rs
@@ -67,7 +67,6 @@ import link::crate_meta_vers;
 import link::crate_meta_extras_hash;
 import metadata::tyencode;
 import metadata::creader;
-import metadata::cwriter;
 import metadata::decoder;
 import pretty::ppaux::ty_to_str;
 import pretty::ppaux::ty_to_short_str;
@@ -1041,6 +1040,11 @@ fn C_str(&@crate_ctxt cx, &str s) -> ValueRef {
     ret llvm::LLVMConstPointerCast(g, T_ptr(T_str()));
 }
 
+// Returns a Plain Old LLVM String:
+fn C_postr(&str s) -> ValueRef {
+    ret llvm::LLVMConstString(str::buf(s), str::byte_len(s), False);
+}
+
 fn C_zero_byte_arr(uint size) -> ValueRef {
     auto i = 0u;
     let vec[ValueRef] elts = [];
@@ -8386,6 +8390,17 @@ fn create_crate_map(&@crate_ctxt ccx) -> ValueRef {
     ret map;
 }
 
+fn write_metadata(&@trans::crate_ctxt cx, &@ast::crate crate) {
+    if (!cx.sess.get_opts().shared) { ret; }
+    auto llmeta = C_postr(metadata::encoder::encode_metadata(cx, crate));
+    auto llconst = trans::C_struct([llmeta]);
+    auto llglobal =
+        llvm::LLVMAddGlobal(cx.llmod, trans::val_ty(llconst),
+                            str::buf("rust_metadata"));
+    llvm::LLVMSetInitializer(llglobal, llconst);
+    llvm::LLVMSetSection(llglobal, str::buf(x86::get_meta_sect_name()));
+}
+
 fn trans_crate(&session::session sess, &@ast::crate crate, &ty::ctxt tcx,
                &str output, &ast_map::map amap) -> ModuleRef {
     auto llmod =
@@ -8452,7 +8467,7 @@ fn trans_crate(&session::session sess, &@ast::crate crate, &ty::ctxt tcx,
     emit_tydescs(ccx);
     // Translate the metadata:
 
-    cwriter::write_metadata(cx.ccx, crate);
+    write_metadata(cx.ccx, crate);
     if (ccx.sess.get_opts().stats) {
         log_err "--- trans stats ---";
         log_err #fmt("n_static_tydescs: %u", ccx.stats.n_static_tydescs);
diff --git a/src/comp/middle/ty.rs b/src/comp/middle/ty.rs
index 6e40bd5eab3..de589a10d9b 100644
--- a/src/comp/middle/ty.rs
+++ b/src/comp/middle/ty.rs
@@ -18,7 +18,6 @@ import front::ast::constr_arg_general;
 import front::ast::mutability;
 import front::ast::controlflow;
 import metadata::creader;
-import metadata::cwriter;
 import metadata::decoder;
 import util::common::*;
 import util::data::interner;
diff --git a/src/comp/rustc.rc b/src/comp/rustc.rc
index 8f586556de5..1527479252e 100644
--- a/src/comp/rustc.rc
+++ b/src/comp/rustc.rc
@@ -69,7 +69,6 @@ mod metadata {
     mod encoder;
     mod decoder;
     mod creader;
-    mod cwriter;
 }
 
 mod driver {