From ffa42994fdcf001c1fe03ad9505dc4aaed7b6069 Mon Sep 17 00:00:00 2001
From: Umar Arshad <umar@arrayfire.com>
Date: Sat, 6 Aug 2016 12:24:19 -0400
Subject: [PATCH] Remove needless copies. Delete copy constructor.

* Deletes the ValidationState_t copy constructor
* Removes needless copies of the copy constructor
---
 source/val/ValidationState.h | 2 ++
 source/validate.cpp          | 6 +++---
 source/validate_id.cpp       | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/source/val/ValidationState.h b/source/val/ValidationState.h
index 65d9144..65a3ce3 100644
--- a/source/val/ValidationState.h
+++ b/source/val/ValidationState.h
@@ -176,6 +176,8 @@ class ValidationState_t {
   }
 
  private:
+  ValidationState_t(const ValidationState_t&);
+
   spv_diagnostic* diagnostic_;
   /// Tracks the number of instructions evaluated by the validator
   int instruction_counter_;
diff --git a/source/validate.cpp b/source/validate.cpp
index dc2173b..836bea1 100644
--- a/source/validate.cpp
+++ b/source/validate.cpp
@@ -153,7 +153,7 @@ void printDot(const ValidationState_t& _, const libspirv::BasicBlock& other) {
          block_string.c_str());
 }
 
-void PrintBlocks(ValidationState_t _, libspirv::Function func) {
+void PrintBlocks(ValidationState_t& _, libspirv::Function func) {
   assert(func.first_block());
 
   printf("%10s -> %s\n", _.getIdOrName(func.id()).c_str(),
@@ -171,7 +171,7 @@ void PrintBlocks(ValidationState_t _, libspirv::Function func) {
 #define UNUSED(func) func
 #endif
 
-UNUSED(void PrintDotGraph(ValidationState_t _, libspirv::Function func)) {
+UNUSED(void PrintDotGraph(ValidationState_t& _, libspirv::Function func)) {
   if (func.first_block()) {
     string func_name(_.getIdOrName(func.id()));
     printf("digraph %s {\n", func_name.c_str());
@@ -218,7 +218,7 @@ spv_result_t spvValidate(const spv_const_context context,
     vector<uint32_t> ids = vstate.UnresolvedForwardIds();
 
     transform(begin(ids), end(ids), ostream_iterator<string>(ss, " "),
-              bind(&ValidationState_t::getIdName, vstate, _1));
+              bind(&ValidationState_t::getIdName, std::ref(vstate), _1));
 
     auto id_str = ss.str();
     return vstate.diag(SPV_ERROR_INVALID_ID)
diff --git a/source/validate_id.cpp b/source/validate_id.cpp
index 58d7073..8473646 100644
--- a/source/validate_id.cpp
+++ b/source/validate_id.cpp
@@ -87,7 +87,7 @@ class idUsage {
   const SpvAddressingModel addressingModel;
   spv_position position;
   spv_diagnostic* pDiagnostic;
-  ValidationState_t module_;
+  const ValidationState_t& module_;
   std::vector<uint32_t> entry_points_;
 };
 
-- 
2.7.4